[vlc-devel] commit: Attach the vout object to parent before spu creation so modules loaded by spu can use var inheritance . (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sat Feb 13 21:04:50 2010 +0100| [859ebb87458b05c797ee29a82d75adbbc0325726] | committer: Antoine Cellerier 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=859ebb87458b05c797ee29a82d75adbbc0325726
---

 src/video_output/video_output.c     |    6 +++---
 src/video_output/vout_subpictures.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index aafb98b..1ed87e3 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 b698b74..2d69e64 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 )