From: Ronald S. Bultje <rsbultje@gmail.com>
Date: Wed, 3 Sep 2008 04:47:44 +0000 (+0000)
Subject: Remove unused code that used to handle protocol concatenation, i.e. trying
X-Git-Tag: v0.5~2723
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ad306bc818c48035af204c350ce136787178dc2;p=platform%2Fupstream%2Flibav.git

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.

Originally committed as revision 15172 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 389b1c5..98f868e 100644
--- 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)