Commit 54526620 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove VLC_OBJECT_DECODER type

parent 4c1919ec
......@@ -33,7 +33,6 @@
/* Object types */
#define VLC_OBJECT_INPUT (-7)
#define VLC_OBJECT_DECODER (-8)
/* Please add new object types below -34 */
/* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666)
......
......@@ -750,7 +750,7 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
decoder_owner_sys_t *p_owner;
es_format_t null_es_format;
p_dec = vlc_custom_create( p_parent, sizeof( *p_dec ), VLC_OBJECT_DECODER,
p_dec = vlc_custom_create( p_parent, sizeof( *p_dec ), VLC_OBJECT_GENERIC,
"decoder" );
if( p_dec == NULL )
return NULL;
......@@ -827,7 +827,7 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
{
p_owner->p_packetizer =
vlc_custom_create( p_parent, sizeof( decoder_t ),
VLC_OBJECT_DECODER, "packetizer" );
VLC_OBJECT_GENERIC, "packetizer" );
if( p_owner->p_packetizer )
{
es_format_Copy( &p_owner->p_packetizer->fmt_in,
......
......@@ -296,8 +296,7 @@ static void ObjectKillChildrens( input_thread_t *p_input, vlc_object_t *p_obj )
/* FIXME ObjectKillChildrens seems a very bad idea in fact */
i = vlc_internals( p_obj )->i_object_type;
if( p_obj == VLC_OBJECT(p_input->p->p_sout) ||
i == VLC_OBJECT_DECODER )
if( p_obj == VLC_OBJECT(p_input->p->p_sout) )
return;
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