Remove unused code that used to handle protocol concatenation, i.e. trying

multiple protocols at the same time. We now cycle protocols individually
to autodetect, making this code no longer needed, and thus the support code
for it in make_setup_request() can be removed. See "[PATCH] remove transport
concatenation dead code" on mailinglist.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15172 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 389b1c5d4fdf62c4d2c914e108112acbed8a5a92..98f868e8a7ad79e6260c14e52e18f520fcbdc50b 100644 (file)
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -896,9 +896,6 @@ make_setup_request (AVFormatContext *s, const char *host, int port,
 
         rtsp_st = rt->rtsp_streams[i];
 
-        /* compute available transports */
-        transport[0] = '\0';
-
         /* RTP/UDP */
         if (protocol == RTSP_PROTOCOL_RTP_UDP) {
             char buf[256];
@@ -923,9 +920,7 @@ make_setup_request (AVFormatContext *s, const char *host, int port,
 
         rtp_opened:
             port = rtp_get_local_port(rtsp_st->rtp_handle);
-            if (transport[0] != '\0')
-                av_strlcat(transport, ",", sizeof(transport));
-            snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1,
+            snprintf(transport, sizeof(transport) - 1,
                      "%s/UDP;unicast;client_port=%d",
                      trans_pref, port);
             if (rt->server_type == RTSP_SERVER_RTP)
@@ -934,17 +929,12 @@ make_setup_request (AVFormatContext *s, const char *host, int port,
 
         /* RTP/TCP */
         else if (protocol == RTSP_PROTOCOL_RTP_TCP) {
-            if (transport[0] != '\0')
-                av_strlcat(transport, ",", sizeof(transport));
-            snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1,
+            snprintf(transport, sizeof(transport) - 1,
                      "%s/TCP", trans_pref);
         }
 
         else if (protocol == RTSP_PROTOCOL_RTP_UDP_MULTICAST) {
-            if (transport[0] != '\0')
-                av_strlcat(transport, ",", sizeof(transport));
-            snprintf(transport + strlen(transport),
-                     sizeof(transport) - strlen(transport) - 1,
+            snprintf(transport, sizeof(transport) - 1,
                      "%s/UDP;multicast", trans_pref);
         }
         if (rt->server_type == RTSP_SERVER_RDT)