Split vout_FixLeaks into vout_FixLeaks and vout_Reset.

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index a9594f1185191aa586f43b1b265aa306a6568121..5cf35bb0599775382b97eb3cbd8c560fd446868c 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -2068,9 +2068,7 @@ static void DeleteDecoder( decoder_t * p_dec )
     {
         /* Hack to make sure all the the pictures are freed by the decoder
          * and that the vout is not paused anymore */
-        vout_FixLeaks( p_owner->p_vout, true );
-        if( p_owner->b_paused )
-            vout_ChangePause( p_owner->p_vout, false, mdate() );
+        vout_Reset( p_owner->p_vout );
 
         /* */
         input_resource_RequestVout( p_owner->p_input->p->p_resource, p_owner->p_vout, NULL, true );
@@ -2379,7 +2377,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
         DecoderSignalBuffering( p_dec, true );
 
         /* Check the decoder doesn't leak pictures */
-        vout_FixLeaks( p_owner->p_vout, false );
+        vout_FixLeaks( p_owner->p_vout );
 
         /* FIXME add a vout_WaitPictureAvailable (timedwait) */
         msleep( VOUT_OUTMEM_SLEEP );