summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-08 05:46:23 +0000
committerbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-08 05:46:23 +0000
commitf767a62a4291dd41ff68fe8e6277f24443ff827d (patch)
treef91e43e2bef3384a63b888ce69dd58e3c3ca9f74 /libmpdemux
parentfeec550941d1cf12d88cac2c5209f28a09cd8ba7 (diff)
downloadmpv-f767a62a4291dd41ff68fe8e6277f24443ff827d.tar.bz2
mpv-f767a62a4291dd41ff68fe8e6277f24443ff827d.tar.xz
Added support for RTSP stream over TCP.
Patch from Ross Finlayson <finlayson@live.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7665 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index fca1e4d52e..ef9ea15821 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -95,7 +95,13 @@ typedef struct RTPState {
struct timeval firstSyncTime;
};
+int rtspStreamOverTCP = 0;
+
extern "C" void demux_open_rtp(demuxer_t* demuxer) {
+ if (rtspStreamOverTCP && LIVEMEDIA_LIBRARY_VERSION_INT < 1033689600) {
+ fprintf(stderr, "TCP streaming of RTP/RTCP requires \"LIVE.COM Streaming Media\" library version 2002.10.04 or later - ignoring the \"-rtsp-stream-over-tcp\" flag\n");
+ rtspStreamOverTCP = 0;
+ }
do {
TaskScheduler* scheduler = BasicTaskScheduler::createNew();
if (scheduler == NULL) break;
@@ -155,7 +161,8 @@ extern "C" void demux_open_rtp(demuxer_t* demuxer) {
if (rtspClient != NULL) {
// Issue RTSP "SETUP" and "PLAY" commands on the chosen subsession:
- if (!rtspClient->setupMediaSubsession(*subsession)) break;
+ if (!rtspClient->setupMediaSubsession(*subsession, False,
+ rtspStreamOverTCP)) break;
if (!rtspClient->playMediaSubsession(*subsession)) break;
}