summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsf <rsf@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-03-19 10:15:41 +0000
committerrsf <rsf@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-03-19 10:15:41 +0000
commit7611ee601ea93f1cd7cd3e5c59c051c78e281aa9 (patch)
tree3c9dc502a235cbf682d9f55dfbc20db7551c8e96
parent1fac9f9861d6ebc41d4028948386d3fdab0de260 (diff)
downloadmpv-7611ee601ea93f1cd7cd3e5c59c051c78e281aa9.tar.bz2
mpv-7611ee601ea93f1cd7cd3e5c59c051c78e281aa9.tar.xz
Fixed a bug that was accidentally introduced by the addition of MPEG Transport
Stream support. We now handle errors such as 'stream not found' correctly once again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12044 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_rtp.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 8bd5d38732..724f9c1be9 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -120,6 +120,7 @@ static char* openURL_sip(SIPClient* client, char const* url) {
int rtspStreamOverTCP = 0;
extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
+ Boolean success = False;
do {
TaskScheduler* scheduler = BasicTaskScheduler::createNew();
if (scheduler == NULL) break;
@@ -253,7 +254,9 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
}
rtpState->flags |= flags;
}
+ success = True;
} while (0);
+ if (!success) return NULL; // an error occurred
// Hack: If audio and video are demuxed together on a single RTP stream,
// then create a new "demuxer_t" structure to allow the higher-level