]> git.sesse.net Git - vlc/commitdiff
decoder: cosmetic, balance mutex around a for-loop
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 23 Apr 2012 16:00:17 +0000 (19:00 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 23 Apr 2012 16:00:45 +0000 (19:00 +0300)
src/input/decoder.c

index e63070355a4e505e13c9add671d6d33822fd8e55..0b0cdf2ea6434c9365c0063616314f31d13c1de8 100644 (file)
@@ -1193,10 +1193,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
         DecoderWaitUnblock( p_dec, &b_reject );
 
         if( p_owner->b_buffering )
-        {
-            vlc_mutex_unlock( &p_owner->lock );
-            return;
-        }
+            break;
 
         /* */
         if( p_owner->buffer.p_audio )
@@ -1247,15 +1244,13 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
         }
 
         if( !b_has_more )
-            break;
+            return;
 
         vlc_mutex_lock( &p_owner->lock );
         if( !p_owner->buffer.p_audio )
-        {
-            vlc_mutex_unlock( &p_owner->lock );
             break;
-        }
     }
+    vlc_mutex_unlock( &p_owner->lock );
 }
 
 static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )