Skip to content

V
vlc-1.1
Commit a8108e04 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Do not use block_FifoWake if block_FifoGet does not check for it

parent 8afb43f7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
modules/access/rtmp/access.c
View file @ a8108e04
...@@ -264,7 +264,6 @@ static void Close( vlc_object_t * p_this ) ...@@ -264,7 +264,6 @@ static void Close( vlc_object_t * p_this )
/* p_sys->p_thread->b_die = true;*/ /* p_sys->p_thread->b_die = true;*/
vlc_object_kill( p_sys->p_thread ); vlc_object_kill( p_sys->p_thread );
block_FifoWake( p_sys->p_thread->p_fifo_input ); 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 ); vlc_thread_join( p_sys->p_thread );
......
modules/access_output/rtmp.c
View file @ a8108e04
...@@ -272,7 +272,6 @@ static void Close( vlc_object_t * p_this ) ...@@ -272,7 +272,6 @@ static void Close( vlc_object_t * p_this )
// p_sys->p_thread->b_die = true; // p_sys->p_thread->b_die = true;
vlc_object_kill( p_sys->p_thread ); vlc_object_kill( p_sys->p_thread );
block_FifoWake( p_sys->p_thread->p_fifo_input ); 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 ); vlc_thread_join( p_sys->p_thread );
......
Markdown is supported
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