vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Jan 5 18:52:15 2015 +0100| [8c387fdd1d3ce056fd35eb2efcdba44f1b97dea5] | committer: Francois Cartegnie
demux: mp4: fix regression on smooth streaming DemuxFrg was no longer selected > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c387fdd1d3ce056fd35eb2efcdba44f1b97dea5 --- modules/demux/mp4/mp4.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 171876c..47e1345 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -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 ) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
