Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
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;
vlc_object_detach( p_sout );
p_input->p->p_sout = NULL;
sout_instance_t *p_sout = p_input->p->p_sout;
vlc_object_detach( p_sout );
p_input->p->p_sout = NULL;
if( p_input )
{
input_StopThread( p_input );
if( 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 );
}
if( p_instance->p_sout )
vlc_object_release( p_input );
}
if( p_instance->p_sout )
}
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 );
if( !p_instance->b_sout_keep && p_instance->p_sout )
{
vlc_object_release( p_input );
if( !p_instance->b_sout_keep && p_instance->p_sout )
{