ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtsp: Parse and use the Content-Base reply header, if present

Browse Source 
This fixes playing RTSP urls with query parameters.

Originally committed as revision 25755 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-11-15 15:08:53 +00:00
parent f3d77632d7
commit dd22cfb101
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtsp.c
View File

@ -706,6 +706,9 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
} else if (av_stristart(p, "Authentication-Info:", &p) && auth_state) { } else if (av_stristart(p, "Authentication-Info:", &p) && auth_state) {
p += strspn(p, SPACE_CHARS); p += strspn(p, SPACE_CHARS);
ff_http_auth_handle_header(auth_state, "Authentication-Info", p); ff_http_auth_handle_header(auth_state, "Authentication-Info", p);
} else if (av_stristart(p, "Content-Base:", &p)) {
p += strspn(p, SPACE_CHARS);
av_strlcpy(reply->content_base, p , sizeof(reply->content_base));
} }
} }

4
libavformat/rtsp.h
View File

@ -165,6 +165,10 @@ typedef struct RTSPMessageHeader {
* returned * returned
*/ */
char reason[256]; char reason[256];
/** The "Content-Base:" field.
*/
char content_base[4096];
} RTSPMessageHeader; } RTSPMessageHeader;
/** /**

3
libavformat/rtspdec.c
View File

@ -105,6 +105,9 @@ int ff_rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply)
av_freep(&content); av_freep(&content);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (reply->content_base[0])
av_strlcpy(rt->control_uri, reply->content_base,
sizeof(rt->control_uri));
av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", content); av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", content);
/* now we got the SDP description, we parse it */ /* now we got the SDP description, we parse it */