[vlc-commits] Do not check vlc_object_alive() on decoders

Rémi Denis-Courmont git at videolan.org
Mon Jul 11 17:38:05 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 11 18:07:11 2011 +0300| [4c1919ec2a5b2158fa7fd5084751c549508dfdf6] | committer: Rémi Denis-Courmont

Do not check vlc_object_alive() on decoders

Decoders are never "killed", so this had no effects.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c1919ec2a5b2158fa7fd5084751c549508dfdf6
---

 src/input/decoder.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 4ae7d33..02385a0 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -598,7 +598,7 @@ void input_DecoderWaitBuffering( decoder_t *p_dec )
 
     vlc_mutex_lock( &p_owner->lock );
 
-    while( vlc_object_alive( p_dec ) && p_owner->b_buffering && !p_owner->buffer.b_full )
+    while( p_owner->b_buffering && !p_owner->buffer.b_full )
     {
         block_FifoWake( p_owner->p_fifo );
         vlc_cond_wait( &p_owner->wait_acknowledge, &p_owner->lock );
@@ -979,7 +979,7 @@ static void DecoderFlush( decoder_t *p_dec )
     input_DecoderDecode( p_dec, p_null, false );
 
     /* */
-    while( vlc_object_alive( p_dec ) && p_owner->b_flushing )
+    while( p_owner->b_flushing )
         vlc_cond_wait( &p_owner->wait_acknowledge, &p_owner->lock );
 }
 



More information about the vlc-commits mailing list