]> git.sesse.net Git - vlc/commitdiff
demux: mp4: fix regression on smooth streaming
authorFrancois Cartegnie <fcvlcdev@free.fr>
Mon, 5 Jan 2015 17:52:15 +0000 (18:52 +0100)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Mon, 5 Jan 2015 17:52:42 +0000 (18:52 +0100)
DemuxFrg was no longer selected

modules/demux/mp4/mp4.c

index 171876c6cc758ee3c88a6ff91280513e6e1dab02..47e1345e2829ee8e657ec0d172ab1f32fa50eef5 100644 (file)
@@ -680,20 +680,16 @@ static int Open( vlc_object_t * p_this )
     if ( !p_sys->moovfragment.p_moox && !p_sys->b_smooth )
         goto error;
 
+    MP4_BoxDumpStructure( p_demux->s, p_sys->p_root );
+
     if( p_sys->b_smooth )
     {
         if( InitTracks( p_demux ) != VLC_SUCCESS )
             goto error;
         CreateTracksFromSmooBox( p_demux );
-        return VLC_SUCCESS;
-    }
-
-    MP4_BoxDumpStructure( p_demux->s, p_sys->p_root );
-
-    if ( p_sys->b_smooth )
-    {
         p_demux->pf_demux = DemuxFrg;
         msg_Dbg( p_demux, "Set DemuxFrg mode" );
+        return VLC_SUCCESS;
     }
     else if( p_sys->b_fragmented )
     {