From 1ce453f08fc9a2875d271a945d9022922ea8c169 Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Fri, 6 Jun 2014 13:00:03 +0200 Subject: [PATCH] demux: ts: fail early probing mpeg4 descriptor --- modules/demux/ts.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 582bb35dd4..4c704a31a6 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -3279,10 +3279,12 @@ static void PMTSetupEsISO14496( demux_t *p_demux, ts_pid_t *pid, for( int i = 0; i < 255; i++ ) { iod_descriptor_t *iod = prg->iod; - - if( iod->es_descr[i].b_ok && iod->es_descr[i].i_es_id == i_es_id ) + if( iod->es_descr[i].i_es_id == i_es_id ) { - pid->es->p_mpeg4desc = &iod->es_descr[i]; + if ( iod->es_descr[i].b_ok ) + pid->es->p_mpeg4desc = &iod->es_descr[i]; + else + msg_Dbg( p_demux, "MPEG-4 descriptor not yet available on es_id=%d", i_es_id ); break; } } -- GitLab