[vlc-devel] commit: mosaic: ad missing var_DelCallback. ( Rémi Duraffort )

git version control git at videolan.org
Fri Jun 26 14:42:07 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Fri Jun 26 11:48:09 2009 +0200| [e8c13befca5750de6cd5f5fbeb5a2ed2274840cb] | committer: Rémi Duraffort 

mosaic: ad missing var_DelCallback.
(cherry picked from commit 2155489172c1fe341738095e70101c6844de4cb3)

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

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

 modules/video_filter/mosaic.c |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index a8d60f0..21357ba 100644
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -393,7 +393,26 @@ static void DestroyFilter( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t*)p_this;
     filter_sys_t *p_sys = p_filter->p_sys;
 
-    /* FIXME: destroy callbacks first! */
+#define DEL_CB( name ) \
+    var_DelCallback( p_filter, CFG_PREFIX #name, MosaicCallback, p_sys )
+    DEL_CB( width );
+    DEL_CB( height );
+    DEL_CB( xoffset );
+    DEL_CB( yoffset );
+
+    DEL_CB( align );
+
+    DEL_CB( borderw );
+    DEL_CB( borderh );
+    DEL_CB( rows );
+    DEL_CB( cols );
+    DEL_CB( alpha );
+    DEL_CB( position );
+    DEL_CB( delay );
+
+    DEL_CB( keep-aspect-ratio );
+    DEL_CB( order );
+#undef DEL_CB
 
     if( !p_sys->b_keep )
     {




More information about the vlc-devel mailing list