vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Jun 2 13:12:19 2014 +0200| [24876369dc4b70672f586b4ef8d2ffaf7129d73b] | committer: Francois Cartegnie
demux: mp4: don't parse data if trun is missing (cid #1219918) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24876369dc4b70672f586b4ef8d2ffaf7129d73b --- modules/demux/mp4/mp4.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 3da3033..2b03b9a 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -5318,18 +5318,18 @@ static int LeafParseMDATwithMOOF( demux_t *p_demux, MP4_Box_t *p_moof ) } } - } + const MP4_Box_data_trun_t *p_trun_data = p_track->context.BOXDATA(p_trun); - const MP4_Box_data_trun_t *p_trun_data = p_track->context.BOXDATA(p_trun); + /* NOW PARSE TRUN WITH MDAT */ + int i_ret = LeafParseTRUN( p_demux, p_track, + i_trun_sample_default_duration, i_trun_sample_default_size, + p_trun_data, & p_sys->context.i_mdatbytesleft ); + if ( i_ret != VLC_SUCCESS ) + goto end; - /* NOW PARSE TRUN WITH MDAT */ - int i_ret = LeafParseTRUN( p_demux, p_track, - i_trun_sample_default_duration, i_trun_sample_default_size, - p_trun_data, & p_sys->context.i_mdatbytesleft ); - if ( i_ret != VLC_SUCCESS ) - goto end; + p_track->context.p_trun = p_track->context.p_trun->p_next; + } - p_track->context.p_trun = p_track->context.p_trun->p_next; if ( p_sys->context.i_mdatbytesleft == 0 ) p_sys->context.i_current_box_type = 0; return VLC_SUCCESS; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
