[vlc-devel] commit: Do not use block_FifoWake if block_FifoGet does not check for it ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Sep 14 10:25:57 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Sep 14 11:29:08 2008 +0300| [a8108e04a37a757b8ea51ef958ca3937cea602cb] | committer: Rémi Denis-Courmont 

Do not use block_FifoWake if block_FifoGet does not check for it

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

 modules/access/rtmp/access.c |    1 -
 modules/access_output/rtmp.c |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 4f16262..0ada7a4 100644
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -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 );
 
diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c
index d401007..8ff62bc 100644
--- a/modules/access_output/rtmp.c
+++ b/modules/access_output/rtmp.c
@@ -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 );
 




More information about the vlc-devel mailing list