Skip to content

V
vlc-gpu
Commit 3f352e35 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

mux_mpeg_ts: no need to lock inside the destructor.

parent 5cde6e77
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
modules/mux/mpeg/ts.c
View file @ 3f352e35
...@@ -856,16 +856,13 @@ static void Close( vlc_object_t * p_this ) ...@@ -856,16 +856,13 @@ static void Close( vlc_object_t * p_this )
sout_mux_sys_t *p_sys = p_mux->p_sys; sout_mux_sys_t *p_sys = p_mux->p_sys;
int i; int i;
vlc_mutex_lock( &p_sys->csa_lock );
if( p_sys->csa ) if( p_sys->csa )
{ {
var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-ck", ChangeKeyCallback, NULL ); 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 "csa2-ck", ChangeKeyCallback, NULL );
var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL ); var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL );
csa_Delete( p_sys->csa ); csa_Delete( p_sys->csa );
p_sys->csa = NULL;
} }
vlc_mutex_unlock( &p_sys->csa_lock );
for( i = 0; i < MAX_PMT; i++ ) for( i = 0; i < MAX_PMT; i++ )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment