]> git.sesse.net Git - vlc/commitdiff
mux_mpeg_ts: no need to lock inside the destructor.
authorRémi Duraffort <ivoire@videolan.org>
Sat, 14 Nov 2009 10:58:10 +0000 (11:58 +0100)
committerRémi Duraffort <ivoire@videolan.org>
Mon, 16 Nov 2009 18:36:55 +0000 (19:36 +0100)
modules/mux/mpeg/ts.c

index 5ddf023c84f72ef1df9a1a407d95eaf6798edeec..5cb02b30eddbf8d8235c259477ce2582ae0dd130 100644 (file)
@@ -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++ )
     {