From 00eb13e05f3fe868ae33055945fad6408d1be3b4 Mon Sep 17 00:00:00 2001 From: Alan Steremberg Date: Fri, 22 Jan 2010 16:04:15 +0000 Subject: Use the control URI from the SDP (if present) rather than the input filename, if present. This fixes playback of a number of MS-RTSP streams, mostly these for which playback contains a session key in the URI. Fixes issue 1697. Patch by Alan Steremberg <$firstname dot $lastname () gmail com>. Originally committed as revision 21381 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavformat/rtsp.h') diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 8f79c759ff..dbd444b983 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -266,6 +266,11 @@ typedef struct RTSPState { * data packet in the bytecontext for each incoming RTSP packet. */ uint64_t asf_pb_pos; //@} + + /** some MS RTSP streams contain a URL in the SDP that we need to use + * for all subsequent RTSP requests, rather than the input URI; in + * other cases, this is a copy of AVFormatContext->filename. */ + char control_uri[1024]; } RTSPState; /** -- cgit v1.2.3