From: Rémi Duraffort <ivoire@videolan.org>
Date: Sat, 14 Nov 2009 10:58:10 +0000 (+0100)
Subject: mux_mpeg_ts: no need to lock inside the destructor.
X-Git-Tag: 1.1.0-ff~2464
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=3f352e35833fa5664f4b17380d933390bc963b86;hp=5cde6e7779c31c79bd89e6a71d88c0f6c3f9afb2;p=vlc

mux_mpeg_ts: no need to lock inside the destructor.
---

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 5ddf023c84..5cb02b30ed 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -856,16 +856,13 @@ static void Close( vlc_object_t * p_this )
     sout_mux_sys_t      *p_sys = p_mux->p_sys;
     int i;
 
-    vlc_mutex_lock( &p_sys->csa_lock );
     if( p_sys->csa )
     {
         var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-ck", ChangeKeyCallback, NULL );
         var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa2-ck", ChangeKeyCallback, NULL );
         var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL );
         csa_Delete( p_sys->csa );
-        p_sys->csa = NULL;
     }
-    vlc_mutex_unlock( &p_sys->csa_lock );
 
     for( i = 0; i < MAX_PMT; i++ )
     {