[vlc-commits] decoder: remove vout_Cancel calls

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jul 31 14:15:56 2019 +0200| [90d1eb79b6f6498770445108d0dfeda331a1d082] | committer: Steve Lhomme

decoder: remove vout_Cancel calls

We don't use the display pool (vout_GetPicture) anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=90d1eb79b6f6498770445108d0dfeda331a1d082
---

 src/input/decoder.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 55001d7996..2aa973c99c 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -826,9 +826,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 );
 }
 
@@ -2203,7 +2200,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 );