Commit cc116115 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

es_out: do not start buffering when already buferring

This fixes an assertion failure.
Regression from 62140018.
parent 7a530806
...@@ -533,8 +533,6 @@ void input_DecoderStartWait( decoder_t *p_dec ) ...@@ -533,8 +533,6 @@ void input_DecoderStartWait( decoder_t *p_dec )
assert( !p_owner->b_waiting ); assert( !p_owner->b_waiting );
input_DecoderFlush( p_dec );
vlc_mutex_lock( &p_owner->lock ); vlc_mutex_lock( &p_owner->lock );
p_owner->b_first = true; p_owner->b_first = true;
p_owner->b_has_data = false; p_owner->b_has_data = false;
......
...@@ -573,14 +573,17 @@ static void EsOutChangePosition( es_out_t *out ) ...@@ -573,14 +573,17 @@ static void EsOutChangePosition( es_out_t *out )
{ {
es_out_id_t *p_es = p_sys->es[i]; es_out_id_t *p_es = p_sys->es[i];
if( !p_es->p_dec ) if( p_es->p_dec != NULL )
continue; {
input_DecoderFlush( p_es->p_dec );
if( !p_sys->b_buffering )
{
input_DecoderStartWait( p_es->p_dec ); input_DecoderStartWait( p_es->p_dec );
if( p_es->p_dec_record != NULL )
if( p_es->p_dec_record )
input_DecoderStartWait( p_es->p_dec_record ); input_DecoderStartWait( p_es->p_dec_record );
} }
}
}
for( int i = 0; i < p_sys->i_pgrm; i++ ) for( int i = 0; i < p_sys->i_pgrm; i++ )
input_clock_Reset( p_sys->pgrm[i]->p_clock ); input_clock_Reset( p_sys->pgrm[i]->p_clock );
......
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