summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.h
diff options
context:
space:
mode:
authorAlan Steremberg <alan.steremberg@gmail.com>2010-01-22 16:04:15 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-01-22 16:04:15 +0000
commit00eb13e05f3fe868ae33055945fad6408d1be3b4 (patch)
tree359734b80dae6f526dca17e666ab2f1764b00306 /libavformat/rtsp.h
parent4a88852623168077d77a073f7ce61047d12becbf (diff)
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
Diffstat (limited to 'libavformat/rtsp.h')
-rw-r--r--libavformat/rtsp.h5
1 files changed, 5 insertions, 0 deletions
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;
/**