From 26ff5fc0738d7e5221bdb2ef31e5e77fb6e23dbf Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 15 Nov 2012 17:11:16 +0100 Subject: [PATCH] rtsp: cleanups --- TODO | 1 - docs/libs/gst-rtsp-server-sections.txt | 4 ---- gst/rtsp-server/rtsp-client.c | 9 +-------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/TODO b/TODO index 1b28c23ea5..53d7d1c0f5 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ - - implement multicast and TCP transports - use a config file to configure the server - error recovery diff --git a/docs/libs/gst-rtsp-server-sections.txt b/docs/libs/gst-rtsp-server-sections.txt index 02aacc9752..fa46f302dc 100644 --- a/docs/libs/gst-rtsp-server-sections.txt +++ b/docs/libs/gst-rtsp-server-sections.txt @@ -37,8 +37,6 @@ gst_rtsp_media_factory_set_auth gst_rtsp_media_factory_get_auth gst_rtsp_media_factory_set_buffer_size gst_rtsp_media_factory_get_buffer_size -gst_rtsp_media_factory_set_multicast_group -gst_rtsp_media_factory_get_multicast_group gst_rtsp_media_factory_construct gst_rtsp_media_factory_create_element @@ -97,8 +95,6 @@ gst_rtsp_media_set_auth gst_rtsp_media_get_auth gst_rtsp_media_set_buffer_size gst_rtsp_media_get_buffer_size -gst_rtsp_media_set_multicast_group -gst_rtsp_media_get_multicast_group gst_rtsp_media_prepare gst_rtsp_media_unprepare diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 9bbec270c0..f353a796c9 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -1281,14 +1281,7 @@ create_sdp (GstRTSPClient * client, GstRTSPMedia * media) info.server_proto = proto; protocols = gst_rtsp_media_get_protocols (media); - if (protocols & GST_RTSP_LOWER_TRANS_UDP_MCAST) -#if 0 - info.server_ip = gst_rtsp_media_get_multicast_group (media); -#else - info.server_ip = g_strdup (client->server_ip); -#endif - else - info.server_ip = g_strdup (client->server_ip); + info.server_ip = g_strdup (client->server_ip); /* create an SDP for the media object */ if (!gst_rtsp_sdp_from_media (sdp, &info, media))