From: Antoine Cellerier <dionoea@videolan.org>
Date: Mon, 23 Jun 2008 15:40:35 +0000 (+0200)
Subject: We don't need to detach. Since we're in the parent's destructor, it's already been... 
X-Git-Tag: 0.9.0-test1~144
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=51b21bc3a21f925a30fd5401bafe50ffedcba382;p=vlc

We don't need to detach. Since we're in the parent's destructor, it's already been done for us.
---

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 710d86093a..eb64a3e7be 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1223,7 +1223,6 @@ static void EndThread( vout_thread_t *p_vout )
     if( !p_vout->b_direct )
     {
         module_Unneed( p_vout->p_chroma, p_vout->p_chroma->p_module );
-        vlc_object_detach( p_vout->p_chroma );
         vlc_object_release( p_vout->p_chroma );
         p_vout->p_chroma = NULL;
     }
diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 14dd76dbd9..70e81c2af2 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -150,8 +150,6 @@ void spu_Destroy( spu_t *p_spu )
 {
     int i_index;
 
-    vlc_object_detach( p_spu );
-
     /* Destroy all remaining subpictures */
     for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
     {