]> git.sesse.net Git - vlc/commitdiff
Do not use block_FifoWake if block_FifoGet does not check for it
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 14 Sep 2008 08:29:08 +0000 (11:29 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 14 Sep 2008 08:29:08 +0000 (11:29 +0300)
modules/access/rtmp/access.c
modules/access_output/rtmp.c

index 4f16262410741312d2cbab25e69306fed085dae9..0ada7a49c72c3c55b2a378a0c0e5653ce6db0f50 100644 (file)
@@ -264,7 +264,6 @@ static void Close( vlc_object_t * p_this )
 /*    p_sys->p_thread->b_die = true;*/
     vlc_object_kill( p_sys->p_thread );
     block_FifoWake( p_sys->p_thread->p_fifo_input );
-    block_FifoWake( p_sys->p_thread->p_empty_blocks );
 
     vlc_thread_join( p_sys->p_thread );
 
index d40100708056370f02506dccb0a2e54e2b3a0b8f..8ff62bc4a48986a76ae3d0f81a738997c0a86f4a 100644 (file)
@@ -272,7 +272,6 @@ static void Close( vlc_object_t * p_this )
 //    p_sys->p_thread->b_die = true;
     vlc_object_kill( p_sys->p_thread );
     block_FifoWake( p_sys->p_thread->p_fifo_input );
-    block_FifoWake( p_sys->p_thread->p_empty_blocks );
 
     vlc_thread_join( p_sys->p_thread );