* Delete Callbacks when closing marquee filter. Thanks to Dave Harley

   for noticing this.

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index cb86c8483766f01b169d67dfeba92f6a2a7173e8..7bed6f689f6ed361e8423537e626f8ac40cc5db8 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -212,6 +212,15 @@ static void DestroyFilter( vlc_object_t *p_this )
     {
         return;
     }
+    var_DelCallback( p_input->p_libvlc, "marq-x", MarqueeCallback, p_sys );
+    var_DelCallback( p_input->p_libvlc, "marq-y", MarqueeCallback, p_sys );
+    var_DelCallback( p_input->p_libvlc, "marq-marquee", MarqueeCallback, p_sys );
+    var_DelCallback( p_input->p_libvlc, "marq-timeout", MarqueeCallback, p_sys );
+    var_DelCallback( p_input->p_libvlc, "marq-position", MarqueeCallback, p_sys );
+    var_DelCallback( p_input->p_libvlc, "marq-color", MarqueeCallback, p_sys );
+    var_DelCallback( p_input->p_libvlc, "marq-opacity", MarqueeCallback, p_sys );
+    var_DelCallback( p_input->p_libvlc, "marq-size", MarqueeCallback, p_sys );
+
     var_Destroy( p_input->p_libvlc , "marq-marquee" );
     var_Destroy( p_input->p_libvlc , "marq-x" );
     var_Destroy( p_input->p_libvlc , "marq-y" );