RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-20 13:57:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Ronald S. Bultje 2008-09-03 04:47:44 +00:00
parent 063ad8205a
commit 0ad306bc81
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/rtsp.c
View File

@ -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)