From a702890f856918efd6711c4128778958db80737a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 22 Mar 2015 22:04:27 +0200 Subject: [PATCH] decoder: fix race / incorrect assertion --- src/input/decoder.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/input/decoder.c b/src/input/decoder.c index d1da2226bf..76c40381d5 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -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; } -- 2.39.2