From: Rémi Duraffort <ivoire@videolan.org>
Date: Thu, 15 Oct 2009 08:59:35 +0000 (+0200)
Subject: mosaic_bridge: add missing var_DelCallback (fix a race condition)
X-Git-Tag: 1.1.0-ff~2879
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d5f3c2a5f50c5b384079f624e86b841ba4b95fda;p=vlc

mosaic_bridge: add missing var_DelCallback (fix a race condition)
---

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 076b501374..30aab1aab0 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -272,6 +272,13 @@ static void Close( vlc_object_t * p_this )
     sout_stream_t     *p_stream = (sout_stream_t*)p_this;
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
+    /* Delete the callbacks */
+    var_DelCallback( p_stream, CFG_PREFIX "height", HeightCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "width", WidthCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "alpha", alphaCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "x", xCallback, p_stream );
+    var_DelCallback( p_stream, CFG_PREFIX "y", yCallback, p_stream );
+
     p_stream->p_sout->i_out_pace_nocontrol--;
 
     free( p_sys->psz_id );