[vlc-commits] live555 check stream_DemuxNew succeeded

[Sébastien Escudier]

vlc/vlc-1.1 | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Thu Apr  7 13:21:35 2011 +0200| [014f4cd8fd0aa76a60db8833a0f0edbe18503388] | committer: Sébastien Escudier

live555 check stream_DemuxNew succeeded
(cherry picked from commit c7df60212025d4458c4d09280296d74ac6e6e173)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=014f4cd8fd0aa76a60db8833a0f0edbe18503388
---

 modules/demux/live555.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 7e91c14..ba0b75e 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -1022,7 +1022,8 @@ static int SessionsSetup( demux_t *p_demux )
                 sub->rtcpInstance()->setByeHandler( StreamClose, tk );
             }
 
-            if( tk->p_es || tk->b_quicktime || tk->b_muxed || tk->b_asf )
+            if( tk->p_es || tk->b_quicktime || ( tk->b_muxed && tk->p_out_muxed ) ||
+                ( tk->b_asf && p_sys->p_out_asf ) )
             {
                 /* Append */
                 p_sys->track = (live_track_t**)xrealloc( p_sys->track,