Commit f8b3ccc7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove VLC_OBJECT_VOUT

(Same reasons as VLC_OBJECT_AOUT)
parent 6e394e9c
......@@ -34,7 +34,6 @@
/* Object types */
#define VLC_OBJECT_INPUT (-7)
#define VLC_OBJECT_DECODER (-8)
#define VLC_OBJECT_VOUT (-9)
/* Please add new object types below -34 */
/* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666)
......
......@@ -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( i == VLC_OBJECT_VOUT ||
p_obj == VLC_OBJECT(p_input->p->p_sout) ||
if( p_obj == VLC_OBJECT(p_input->p->p_sout) ||
i == VLC_OBJECT_DECODER )
return;
......
......@@ -120,7 +120,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
/* Allocate descriptor */
vout_thread_t *vout = vlc_custom_create(object,
sizeof(*vout) + sizeof(*vout->p),
VLC_OBJECT_VOUT, "video output");
VLC_OBJECT_GENERIC, "video output");
if (!vout) {
video_format_Clean(&original);
return NULL;
......
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