Commit 859ebb87 authored by Antoine Cellerier's avatar Antoine Cellerier

Attach the vout object to parent before spu creation so modules loaded by spu...

Attach the vout object to parent before spu creation so modules loaded by spu can use var inheritance.
parent 2b34460c
...@@ -408,12 +408,12 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) ...@@ -408,12 +408,12 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
/* Mouse object (area of interest in a video filter) */ /* Mouse object (area of interest in a video filter) */
var_Create( p_vout, "mouse-object", VLC_VAR_BOOL ); var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
/* Initialize subpicture unit */
p_vout->p_spu = spu_Create( p_vout );
/* Attach the new object now so we can use var inheritance below */ /* Attach the new object now so we can use var inheritance below */
vlc_object_attach( p_vout, p_parent ); vlc_object_attach( p_vout, p_parent );
/* Initialize subpicture unit */
p_vout->p_spu = spu_Create( p_vout );
/* */ /* */
spu_Init( p_vout->p_spu ); spu_Init( p_vout->p_spu );
......
...@@ -195,7 +195,7 @@ spu_t *spu_Create( vlc_object_t *p_this ) ...@@ -195,7 +195,7 @@ spu_t *spu_Create( vlc_object_t *p_this )
{ {
spu_t *p_spu; spu_t *p_spu;
spu_private_t *p_sys; spu_private_t *p_sys;
p_spu = vlc_custom_create( p_this, sizeof(spu_t) + sizeof(spu_private_t), p_spu = vlc_custom_create( p_this, sizeof(spu_t) + sizeof(spu_private_t),
VLC_OBJECT_GENERIC, "subpicture" ); VLC_OBJECT_GENERIC, "subpicture" );
if( !p_spu ) if( !p_spu )
......
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