Commit de39696d authored by François Cartegnie's avatar François Cartegnie 🤞

demux: mp4: go forward on null sample

Was regression with that tricky one:
http://streams.videolan.org/issues/10981/6.mp4
parent b3b928e8
...@@ -917,10 +917,11 @@ static int Demux( demux_t *p_demux ) ...@@ -917,10 +917,11 @@ static int Demux( demux_t *p_demux )
b_data_sent = true; b_data_sent = true;
} }
es_out_Send( p_demux->out, tk->p_es, p_block ); es_out_Send( p_demux->out, tk->p_es, p_block );
}
/* Next sample */ /* Next sample */
if ( i_nb_samples ) /* sample size could be 0, need to go fwd. see return */
MP4_TrackNextSample( p_demux, tk, i_nb_samples ); MP4_TrackNextSample( p_demux, tk, i_nb_samples );
}
end: end:
if ( b_data_sent ) if ( b_data_sent )
...@@ -935,7 +936,7 @@ end: ...@@ -935,7 +936,7 @@ end:
} }
} }
return b_data_sent; return b_data_sent || ( i_samplessize == 0 && i_nb_samples );
} }
static void MP4_UpdateSeekpoint( demux_t *p_demux ) static void MP4_UpdateSeekpoint( demux_t *p_demux )
......
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