Commit 31344ca1 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: mp4: remove handler check at es creation time (fix #12685)

fmt cat is checked/mapped earlier against handler
parent ebe6e7de
...@@ -2381,7 +2381,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -2381,7 +2381,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
switch( p_track->fmt.i_cat ) switch( p_track->fmt.i_cat )
{ {
case VIDEO_ES: 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; return VLC_EGENERIC;
SetupVideoES( p_demux, p_track, p_sample ); SetupVideoES( p_demux, p_track, p_sample );
...@@ -2397,13 +2397,13 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -2397,13 +2397,13 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
break; break;
case AUDIO_ES: 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; return VLC_EGENERIC;
SetupAudioES( p_demux, p_track, p_sample ); SetupAudioES( p_demux, p_track, p_sample );
break; break;
case SPU_ES: 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; return VLC_EGENERIC;
SetupSpuES( p_demux, p_track, p_sample ); SetupSpuES( p_demux, p_track, p_sample );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment