Commit 2c1a1fdf authored by Laurent Aimar's avatar Laurent Aimar

Fix deadlock in decoders because of input ObjectKillChildrens.

A better solution than ObjectKillChildrens is really needed.
parent 9a31d3ab
...@@ -489,9 +489,12 @@ static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj ) ...@@ -489,9 +489,12 @@ static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj )
vlc_list_t *p_list; vlc_list_t *p_list;
int i; int i;
/* FIXME ObjectKillChildrens seems a very bad idea in fact */
if( p_obj->i_object_type == VLC_OBJECT_VOUT || if( p_obj->i_object_type == VLC_OBJECT_VOUT ||
p_obj->i_object_type == VLC_OBJECT_AOUT || p_obj->i_object_type == VLC_OBJECT_AOUT ||
p_obj == VLC_OBJECT(p_input->p->p_sout) ) p_obj == VLC_OBJECT(p_input->p->p_sout) ||
p_obj->i_object_type == VLC_OBJECT_DECODER ||
p_obj->i_object_type == VLC_OBJECT_PACKETIZER )
return; return;
vlc_object_kill( p_obj ); vlc_object_kill( p_obj );
......
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