[vlc-devel] commit: We don't need to detach. Since we're in the parent's destructor, it 's already been done for us. (Antoine Cellerier )

git version control git at videolan.org
Mon Jun 23 17:38:49 CEST 2008


vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Mon Jun 23 17:40:35 2008 +0200| [51b21bc3a21f925a30fd5401bafe50ffedcba382]

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

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

 src/video_output/video_output.c     |    1 -
 src/video_output/vout_subpictures.c |    2 --
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 710d860..eb64a3e 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 14dd76d..70e81c2 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++ )
     {




More information about the vlc-devel mailing list