From c10a4dce37c91443dba16de23bf9a4905c09a50e Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 5 Jul 2008 21:42:38 +0300 Subject: [PATCH] CSA: simplify and remove scary amd64 warning --- modules/mux/mpeg/ts.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index d347e7d85f..6afe0c83d5 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -900,20 +900,14 @@ static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd, VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); sout_mux_t *p_mux = (sout_mux_t*)p_this; 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 ); - if ( i_tmp ) - { - 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 ); - } + ret = csa_SetCW( p_this, p_sys->csa, newval.psz_string, + !!(intptr_t)p_data ); vlc_mutex_unlock( &p_sys->csa_lock ); - return i_tmp; + return ret; } /***************************************************************************** -- 2.39.5