From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Sat, 28 Jun 2008 09:37:05 +0000 (+0300)
Subject: __EVEN: expansion-safety
X-Git-Tag: 0.9.0-test1~96
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=10eab32c8fa2c23467bb2efb3c9c30b077bc47fa;p=vlc

__EVEN: expansion-safety
---

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index b121e1f855..a0b7cc2ea1 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -33,7 +33,7 @@
 
 #define AVI_DEBUG 1
 
-#define __EVEN( x ) ( (x)&0x01 ? (x)+1 : (x) )
+#define __EVEN( x ) (((x) + 1) & ~1)
 
 static vlc_fourcc_t GetFOURCC( const uint8_t *p_buff )
 {
diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 382b553836..0613dd868d 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -73,7 +73,7 @@ struct demux_sys_t
     int pi_chan_table[AOUT_CHAN_MAX];
 };
 
-#define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) )
+#define __EVEN( x ) (((x) + 1) & ~1)
 
 static int ChunkFind( demux_t *, const char *, unsigned int * );