Skip to content

V
vlc
Commit a702890f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

decoder: fix race / incorrect assertion

parent 001e2bb3
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
src/input/decoder.c
View file @ a702890f
...@@ -2130,9 +2130,8 @@ void input_DecoderWait( decoder_t *p_dec ) ...@@ -2130,9 +2130,8 @@ void input_DecoderWait( decoder_t *p_dec )
vlc_fifo_Lock( p_owner->p_fifo ); vlc_fifo_Lock( p_owner->p_fifo );
while( !p_owner->b_has_data ) 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" ); msg_Warn( p_dec, "can't wait without data to decode" );
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment