From: Antoine Cellerier <dionoea@videolan.org>
Date: Sat, 13 Feb 2010 20:04:50 +0000 (+0100)
Subject: Attach the vout object to parent before spu creation so modules loaded by spu can... 
X-Git-Tag: 1.1.0-ff~92
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=859ebb87458b05c797ee29a82d75adbbc0325726;p=vlc

Attach the vout object to parent before spu creation so modules loaded by spu can use var inheritance.
---

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index aafb98ba32..1ed87e3d85 100644
--- 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 b698b749e0..2d69e6433e 100644
--- 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 )