[vlc-devel] commit: Move the add/del_callback call ( to be sure to have the needed ressources). ( Rémi Duraffort )

git version control git at videolan.org
Thu Jun 25 13:30:33 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Thu Jun 25 12:11:54 2009 +0200| [5153449311465092985a526a82bf002a30203d53] | committer: Rémi Duraffort 

Move the add/del_callback call (to be sure to have the needed ressources).
(cherry picked from commit 4bea3fe8b07e37f44a90df46f3d4243666936988)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

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

 modules/video_filter/deinterlace.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 08f135d..3b86b7d 100644
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -389,12 +389,12 @@ static int Init( vout_thread_t *p_vout )
         return VLC_EGENERIC;
     }
 
-    var_AddCallback( p_vout, "deinterlace-mode", FilterCallback, NULL );
-
     vout_filter_AllocateDirectBuffers( p_vout, VOUT_MAX_PICTURES );
 
     vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, MouseEvent );
 
+    var_AddCallback( p_vout, "deinterlace-mode", FilterCallback, NULL );
+
     return VLC_SUCCESS;
 }
 
@@ -418,6 +418,8 @@ static void End( vout_thread_t *p_vout )
 {
     vout_sys_t *p_sys = p_vout->p_sys;
 
+    var_DelCallback( p_vout, "deinterlace-mode", FilterCallback, NULL );
+
     if( p_sys->p_vout )
     {
         vout_filter_DelChild( p_vout, p_sys->p_vout, MouseEvent );




More information about the vlc-devel mailing list