From 9119f4fae02b845f1661e1ac3f0794c759725ebf Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Escudier?= Date: Tue, 4 Nov 2008 16:12:58 +0100 Subject: [PATCH] input_DetachSout corrections MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Denis-Courmont --- src/input/input.c | 1 + src/input/vlm.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/input/input.c b/src/input/input.c index a147b2ea6a..4f37c842e0 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -490,6 +490,7 @@ void input_StopThread( 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; vlc_object_detach( p_sout ); p_input->p->p_sout = NULL; diff --git a/src/input/vlm.c b/src/input/vlm.c index ed265a1101..42a7036c70 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -768,8 +768,8 @@ static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance ) if( p_input ) { input_StopThread( p_input ); - p_instance->p_sout = input_DetachSout( p_input ); vlc_thread_join( p_input ); + p_instance->p_sout = input_DetachSout( p_input ); vlc_object_release( p_input ); } if( p_instance->p_sout ) @@ -846,8 +846,8 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * } input_StopThread( p_input ); - p_instance->p_sout = input_DetachSout( p_input ); vlc_thread_join( p_input ); + p_instance->p_sout = input_DetachSout( p_input ); vlc_object_release( p_input ); if( !p_instance->b_sout_keep && p_instance->p_sout ) { -- 2.39.2