Skip to content

V
vlc-1.1
Commit 6d6c549c authored by Kaloyan Kovachev's avatar Kaloyan Kovachev Committed by Rémi Denis-Courmont
Browse files
Options

Small fixes for ts_mux 

Signed-off-by: default avatarRémi Denis-Courmont <rdenis@simphalempin.com>
parent 9b587a81
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/mux/mpeg/ts.c
View file @ 6d6c549c
...@@ -817,6 +817,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -817,6 +817,7 @@ static int Open( vlc_object_t *p_this )
else else
{ {
csa_Delete( p_sys->csa ); csa_Delete( p_sys->csa );
p_sys->csa = NULL;
} }
if( p_sys->csa ) if( p_sys->csa )
...@@ -874,9 +875,9 @@ static void Close( vlc_object_t * p_this ) ...@@ -874,9 +875,9 @@ static void Close( vlc_object_t * p_this )
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 ); vlc_mutex_unlock( &p_sys->csa_lock );
vlc_mutex_destroy( &p_sys->csa_lock );
for( i = 0; i < MAX_PMT; i++ ) for( i = 0; i < MAX_PMT; i++ )
{ {
...@@ -884,6 +885,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -884,6 +885,7 @@ static void Close( vlc_object_t * p_this )
free( p_sys->sdt_descriptors[i].psz_provider ); free( p_sys->sdt_descriptors[i].psz_provider );
} }
vlc_mutex_destroy( &p_sys->csa_lock );
free( p_sys->dvbpmt ); free( p_sys->dvbpmt );
free( p_sys ); free( p_sys );
} }
......
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