From 7541f32edd8b761c87160bf43ef97b11acb7f720 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 24 Oct 2009 15:18:21 +0000 Subject: [PATCH] Suppress ?params in the rtsp uri Right now rtsp demuxer receives it's ffmpeg specific params encoded in the url That made the server receiving requests with the url ending with "?udp", "?multicast" and "?tcp". That may or may not cause problems to servers with overly strict or overly simple uri parsers Patch from Armand Bendanan (name.surnameATfreeDOTfr) Originally committed as revision 20363 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 535adcd823..f92c07afde 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1215,6 +1215,11 @@ static int rtsp_read_header(AVFormatContext *s, else if (strcmp(option, "tcp") == 0) lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_TCP); } + // Suppress the options in the filename + if (option_list = strchr(s->filename, '?')) { + *option_list = 0; + dprintf(NULL, "### rtsp_read_header: suppr options:%s\n", s->filename); + } } if (!lower_transport_mask)