[vlc-devel] commit: mux_mpeg_ts: no need to lock inside the destructor. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sat Nov 14 11:58:10 2009 +0100| [3f352e35833fa5664f4b17380d933390bc963b86] | committer: Rémi Duraffort 

mux_mpeg_ts: no need to lock inside the destructor.

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

 modules/mux/mpeg/ts.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 5ddf023..5cb02b3 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++ )
     {