[vlc-commits] decoder: call vout_FlushAll() under lock

Steve Lhomme git at videolan.org
Fri Sep 6 12:17:02 CEST 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Sep  3 12:08:13 2019 +0200| [8969a1400d181bf45872db27b66fb0b264dfd526] | committer: Steve Lhomme

decoder: call vout_FlushAll() under lock

That's how it's done in DecoderProcessFlush(). No need to unlock/lock again
just for that.

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

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

diff --git a/src/input/decoder.c b/src/input/decoder.c
index a9b9941ef6..ea0667b9a8 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1000,7 +1000,6 @@ static int DecoderPlayVideo( struct decoder_owner *p_owner, picture_t *p_picture
     }
 
     p_owner->i_preroll_end = PREROLL_NONE;
-    vlc_mutex_unlock( &p_owner->lock );
 
     if( unlikely(prerolled) )
     {
@@ -1010,9 +1009,6 @@ static int DecoderPlayVideo( struct decoder_owner *p_owner, picture_t *p_picture
             vout_FlushAll( p_vout );
     }
 
-    /* */
-    vlc_mutex_lock( &p_owner->lock );
-
     if( p_owner->b_waiting && !p_owner->b_first )
     {
         p_owner->b_has_data = true;



More information about the vlc-commits mailing list