[vlc-devel] [PATCH 1/2] decoder: remove vout_Cancel calls

[Steve Lhomme]

We don't use the display pool (vout_GetPicture) anymore.
---
 src/input/decoder.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index f3b9a9b841c..d4df9d3e7da 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -892,9 +892,6 @@ static void DecoderThread_AbortPictures( decoder_t *p_dec, bool b_abort )
     vlc_mutex_lock( &p_owner->lock ); // called in DecoderThread
     if (p_owner->out_pool)
         picture_pool_Cancel( p_owner->out_pool, b_abort );
-
-    if( p_owner->p_vout != NULL )
-        vout_Cancel( p_owner->p_vout, b_abort );
     vlc_mutex_unlock( &p_owner->lock );
 }
 
@@ -2277,7 +2274,6 @@ void input_DecoderDelete( decoder_t *p_dec )
     {
         if (p_owner->out_pool)
             picture_pool_Cancel( p_owner->out_pool, true );
-        vout_Cancel( p_owner->p_vout, true );
     }
     vlc_mutex_unlock( &p_owner->lock );
 
-- 
2.17.1