__EVEN: expansion-safety

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index b121e1f855daddc67069b48ca7e7f1ae6bfc2af0..a0b7cc2ea1565947532b93e88f8bb730d45fbdac 100644 (file)
--- 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 382b553836d76aaea63ba4767df3170695ce3a6f..0613dd868d4dd8a485f463d051a16614fe0566c0 100644 (file)
--- 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 * );