vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Sat Jun 13 19:53:26 2015 +0200| [31344ca1fc0b7f34344dc6c0173c93e801c3805f] | committer: Francois Cartegnie
demux: mp4: remove handler check at es creation time (fix #12685) fmt cat is checked/mapped earlier against handler > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=31344ca1fc0b7f34344dc6c0173c93e801c3805f --- modules/demux/mp4/mp4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 2cc8b58..6c6c3f4 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -2381,7 +2381,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, switch( p_track->fmt.i_cat ) { case VIDEO_ES: - if ( !p_sample->data.p_sample_vide || p_sample->i_handler != ATOM_vide ) + if ( !p_sample->data.p_sample_vide ) return VLC_EGENERIC; SetupVideoES( p_demux, p_track, p_sample ); @@ -2397,13 +2397,13 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, break; case AUDIO_ES: - if ( !p_sample->data.p_sample_soun || p_sample->i_handler != ATOM_soun ) + if ( !p_sample->data.p_sample_soun ) return VLC_EGENERIC; SetupAudioES( p_demux, p_track, p_sample ); break; case SPU_ES: - if ( !p_sample->data.p_sample_text || p_sample->i_handler != ATOM_text ) + if ( !p_sample->data.p_sample_text ) return VLC_EGENERIC; SetupSpuES( p_demux, p_track, p_sample ); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
