]> git.sesse.net Git - vlc/commitdiff
decoder: fix race / incorrect assertion
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 22 Mar 2015 20:04:27 +0000 (22:04 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 22 Mar 2015 20:04:27 +0000 (22:04 +0200)
src/input/decoder.c

index d1da2226bf4eef09eda7742ce6a2cbaf7bfefa20..76c40381d5774876e1e6b3ddab044a2f26c7c1ec 100644 (file)
@@ -2130,9 +2130,8 @@ void input_DecoderWait( decoder_t *p_dec )
     vlc_fifo_Lock( p_owner->p_fifo );
     while( !p_owner->b_has_data )
     {
-        if( p_owner->b_idle )
+        if( p_owner->b_idle && vlc_fifo_IsEmpty( p_owner->p_fifo ) )
         {
-            assert( vlc_fifo_IsEmpty( p_owner->p_fifo ) );
             msg_Warn( p_dec, "can't wait without data to decode" );
             break;
         }