Changeset c10a4dce37c91443dba16de23bf9a4905c09a50e

Show
Ignore:
Timestamp:
07/05/08 20:42:38 (2 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1215283358 +0300
git-parent:

[82f0bbdcc3a50c45c2b51d7263d3386a48ef9158]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1215283358 +0300
Message:

CSA: simplify and remove scary amd64 warning

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/mux/mpeg/ts.c

    r6d6c549 rc10a4dc  
    901901    sout_mux_t      *p_mux = (sout_mux_t*)p_this; 
    902902    sout_mux_sys_t  *p_sys = p_mux->p_sys; 
    903     int             i_tmp = (int)p_data; 
     903    int ret; 
    904904 
    905905    vlc_mutex_lock( &p_sys->csa_lock ); 
    906     if ( i_tmp ) 
    907     { 
    908         i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, true ); 
    909     } 
    910     else 
    911     { 
    912         i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, false ); 
    913     } 
     906    ret = csa_SetCW( p_this, p_sys->csa, newval.psz_string, 
     907                     !!(intptr_t)p_data ); 
    914908    vlc_mutex_unlock( &p_sys->csa_lock ); 
    915909 
    916     return i_tmp; 
     910    return ret; 
    917911} 
    918912