mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix indentation again

Browse source
This commit is contained in:
Sebastian Dröge 2018-08-14 14:31:55 +03:00
parent cbe6ae3c48
commit bd76c2f9c5
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/rtsp-server/rtsp-client.c
View file

@ -1986,12 +1986,14 @@ default_configure_client_transport (GstRTSPClient * client,
*/ */
/* FIXME: could be more adequately solved by making it possible /* FIXME: could be more adequately solved by making it possible
* to set a socket on multiudpsink after it has already been started */ * to set a socket on multiudpsink after it has already been started */
if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, G_SOCKET_FAMILY_IPV4, ct, if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream,
use_client_settings) && family == G_SOCKET_FAMILY_IPV4) G_SOCKET_FAMILY_IPV4, ct, use_client_settings)
&& family == G_SOCKET_FAMILY_IPV4)
goto error_allocating_ports; goto error_allocating_ports;
if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, G_SOCKET_FAMILY_IPV6, ct, if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream,
use_client_settings) && family == G_SOCKET_FAMILY_IPV6) G_SOCKET_FAMILY_IPV6, ct, use_client_settings)
&& family == G_SOCKET_FAMILY_IPV6)
goto error_allocating_ports; goto error_allocating_ports;
if (ct->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) { if (ct->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {

6
tests/check/gst/stream.c
View file

@ -529,9 +529,11 @@ check_multicast_client_address (const gchar * destination, guint port,
G_SOCKET_FAMILY_IPV4, transport, TRUE) == expected_res); G_SOCKET_FAMILY_IPV4, transport, TRUE) == expected_res);
fail_unless (gst_rtsp_stream_add_multicast_client_address (stream, fail_unless (gst_rtsp_stream_add_multicast_client_address (stream,
destination, ports.min, ports.max, G_SOCKET_FAMILY_IPV4) == expected_res); destination, ports.min, ports.max,
G_SOCKET_FAMILY_IPV4) == expected_res);
fail_unless (gst_rtsp_stream_complete_stream (stream, transport) == expected_res); fail_unless (gst_rtsp_stream_complete_stream (stream,
transport) == expected_res);
fail_unless (gst_rtsp_transport_free (transport) == GST_RTSP_OK); fail_unless (gst_rtsp_transport_free (transport) == GST_RTSP_OK);
addr_str = gst_rtsp_stream_get_multicast_client_addresses (stream); addr_str = gst_rtsp_stream_get_multicast_client_addresses (stream);