Skip to content

V
vlc
Commit cb99eaca authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

TS mux: csaSetup() returns the CSA context created 

Don't use sys->csa, prefer to use the local variable
parent 2ad2a0bd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/mux/mpeg/ts.c
View file @ cb99eaca
...@@ -464,11 +464,10 @@ static csa_t *csaSetup( vlc_object_t *p_this ) ...@@ -464,11 +464,10 @@ static csa_t *csaSetup( vlc_object_t *p_this )
vlc_mutex_init( &p_sys->csa_lock ); vlc_mutex_init( &p_sys->csa_lock );
p_sys->b_crypt_audio = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-audio" ); p_sys->b_crypt_audio = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-audio" );
p_sys->b_crypt_video = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-video" ); p_sys->b_crypt_video = var_GetBool( p_mux, SOUT_CFG_PREFIX "crypt-video" );
p_sys->csa = csa;
char *csa2ck = var_CreateGetNonEmptyStringCommand( p_mux, SOUT_CFG_PREFIX "csa2-ck"); char *csa2ck = var_CreateGetNonEmptyStringCommand( p_mux, SOUT_CFG_PREFIX "csa2-ck");
if (!csa2ck || csa_SetCW( p_this, p_sys->csa, csa2ck, false ) ) if (!csa2ck || csa_SetCW( p_this, csa, csa2ck, false ) )
csa_SetCW( p_this, p_sys->csa, csack, false ); csa_SetCW( p_this, csa, csack, false );
free(csa2ck); free(csa2ck);
var_Create( p_mux, SOUT_CFG_PREFIX "csa-use", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); var_Create( p_mux, SOUT_CFG_PREFIX "csa-use", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
......
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