Skip to content

V
vlc-1.1
Commit 9119f4fa authored by Sébastien Escudier's avatar Sébastien Escudier Committed by Rémi Denis-Courmont
Browse files
Options

input_DetachSout corrections 

Signed-off-by: default avatarRémi Denis-Courmont <rdenis@simphalempin.com>
parent 77b33ced
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/input/input.c
View file @ 9119f4fa
...@@ -490,6 +490,7 @@ void input_StopThread( input_thread_t *p_input ) ...@@ -490,6 +490,7 @@ void input_StopThread( input_thread_t *p_input )
sout_instance_t * input_DetachSout( input_thread_t *p_input ) sout_instance_t * input_DetachSout( input_thread_t *p_input )
{ {
assert( p_input->b_dead );
sout_instance_t *p_sout = p_input->p->p_sout; sout_instance_t *p_sout = p_input->p->p_sout;
vlc_object_detach( p_sout ); vlc_object_detach( p_sout );
p_input->p->p_sout = NULL; p_input->p->p_sout = NULL;
......
src/input/vlm.c
View file @ 9119f4fa
...@@ -768,8 +768,8 @@ static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance ) ...@@ -768,8 +768,8 @@ static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance )
if( p_input ) if( p_input )
{ {
input_StopThread( p_input ); input_StopThread( p_input );
p_instance->p_sout = input_DetachSout( p_input );
vlc_thread_join( p_input ); vlc_thread_join( p_input );
p_instance->p_sout = input_DetachSout( p_input );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
if( p_instance->p_sout ) if( p_instance->p_sout )
...@@ -846,8 +846,8 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * ...@@ -846,8 +846,8 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
} }
input_StopThread( p_input ); input_StopThread( p_input );
p_instance->p_sout = input_DetachSout( p_input );
vlc_thread_join( p_input ); vlc_thread_join( p_input );
p_instance->p_sout = input_DetachSout( p_input );
vlc_object_release( p_input ); vlc_object_release( p_input );
if( !p_instance->b_sout_keep && p_instance->p_sout ) if( !p_instance->b_sout_keep && p_instance->p_sout )
{ {
......
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