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

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index aafb98ba32142589c6bb5c88e26aa5b5625a3113..1ed87e3d8506d89b25bbe42a2ba1e06fc9f20ba2 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -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) */
     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 */
     vlc_object_attach( p_vout, p_parent );
 
+    /* Initialize subpicture unit */
+    p_vout->p_spu = spu_Create( p_vout );
+
     /* */
     spu_Init( p_vout->p_spu );
 

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index b698b749e033914b8b6bf9f4382654855f9e8e4e..2d69e6433e5985bcdb6ab1c19c2822b008d15e5a 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -195,7 +195,7 @@ spu_t *spu_Create( vlc_object_t *p_this )
 {
     spu_t *p_spu;
     spu_private_t *p_sys;
- 
+
     p_spu = vlc_custom_create( p_this, sizeof(spu_t) + sizeof(spu_private_t),
                                VLC_OBJECT_GENERIC, "subpicture" );
     if( !p_spu )