Skip to content

V
vlc-1.1
Commit c10a4dce authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

CSA: simplify and remove scary amd64 warning

parent 82f0bbdc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
modules/mux/mpeg/ts.c
View file @ c10a4dce
...@@ -900,20 +900,14 @@ static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -900,20 +900,14 @@ static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd,
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
sout_mux_t *p_mux = (sout_mux_t*)p_this; sout_mux_t *p_mux = (sout_mux_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_tmp = (int)p_data; int ret;
vlc_mutex_lock( &p_sys->csa_lock ); vlc_mutex_lock( &p_sys->csa_lock );
if ( i_tmp ) ret = csa_SetCW( p_this, p_sys->csa, newval.psz_string,
{ !!(intptr_t)p_data );
i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, true );
}
else
{
i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, false );
}
vlc_mutex_unlock( &p_sys->csa_lock ); vlc_mutex_unlock( &p_sys->csa_lock );
return i_tmp; return ret;
} }
/***************************************************************************** /*****************************************************************************
......
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