vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 22 22:04:27 2015 +0200| [a702890f856918efd6711c4128778958db80737a] | committer: Rémi Denis-Courmont
decoder: fix race / incorrect assertion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a702890f856918efd6711c4128778958db80737a --- 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 d1da222..76c4038 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; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
