Commit 41bacf4a authored by Laurent Aimar's avatar Laurent Aimar
Browse files

Protect a few whiles againts possible broken decoder.

parent aa4b4371
...@@ -339,7 +339,7 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block ) ...@@ -339,7 +339,7 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
if( p_owner->p_input->p->b_out_pace_control ) if( p_owner->p_input->p->b_out_pace_control )
{ {
/* FIXME !!!!! */ /* FIXME !!!!! */
while( !p_dec->b_die && !p_dec->b_error && while( vlc_object_alive( p_dec ) && !p_dec->b_error &&
block_FifoCount( p_owner->p_fifo ) > 10 ) block_FifoCount( p_owner->p_fifo ) > 10 )
{ {
msleep( 1000 ); msleep( 1000 );
...@@ -724,7 +724,7 @@ static void DecoderFlush( decoder_t *p_dec ) ...@@ -724,7 +724,7 @@ static void DecoderFlush( decoder_t *p_dec )
/* */ /* */
if( p_owner->b_own_thread ) if( p_owner->b_own_thread )
{ {
while( p_owner->b_flushing ) while( vlc_object_alive( p_dec ) && p_owner->b_flushing )
vlc_cond_wait( &p_owner->wait, &p_owner->lock ); vlc_cond_wait( &p_owner->wait, &p_owner->lock );
} }
} }
......
Supports Markdown
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