[Mplayer-cvslog] CVS: main/libmpdemux demux_rtp.cpp,1.22,1.23

[Ross Finlayson CVS]

CVS change done by Ross Finlayson CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv1700

Modified Files:
	demux_rtp.cpp 
Log Message:
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.



Index: demux_rtp.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demux_rtp.cpp	2 Mar 2004 08:52:59 -0000	1.22
+++ demux_rtp.cpp	19 Mar 2004 10:15:41 -0000	1.23
@@ -120,6 +120,7 @@
 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 @@
       }
       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