es_out: do not start buffering when already buferring

This fixes an assertion failure.
Regression from 621400186a49b282197267e588a030b425829a64.

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 8cb162c4d3f476d0fc54b4fdca037392b66d5466..062a111b6520aa1d6cc7d5573b5905e4eeb09b8e 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -533,8 +533,6 @@ void input_DecoderStartWait( decoder_t *p_dec )
 
     assert( !p_owner->b_waiting );
 
-    input_DecoderFlush( p_dec );
-
     vlc_mutex_lock( &p_owner->lock );
     p_owner->b_first = true;
     p_owner->b_has_data = false;

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 14464769e726404fb4c2d820433f333cd1332eea..b2326435e9923971fbc862425f8078a860a0347c 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -573,13 +573,16 @@ static void EsOutChangePosition( es_out_t *out )
     {
         es_out_id_t *p_es = p_sys->es[i];
 
-        if( !p_es->p_dec )
-            continue;
-
-        input_DecoderStartWait( p_es->p_dec );
-
-        if( p_es->p_dec_record )
-            input_DecoderStartWait( p_es->p_dec_record );
+        if( p_es->p_dec != NULL )
+        {
+            input_DecoderFlush( p_es->p_dec );
+            if( !p_sys->b_buffering )
+            {
+                input_DecoderStartWait( p_es->p_dec );
+                if( p_es->p_dec_record != NULL )
+                    input_DecoderStartWait( p_es->p_dec_record );
+            }
+        }
     }
 
     for( int i = 0; i < p_sys->i_pgrm; i++ )