Declared many static variables const

[vlc] / modules / demux / avi / libavi.c

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index b121e1f855daddc67069b48ca7e7f1ae6bfc2af0..add60783b4edd5c1a7339f6c50dbe9ffff9745aa 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 )
 {
@@ -575,7 +575,7 @@ static void AVI_ChunkFree_indx( avi_chunk_t *p_chk )
 
 
 
-static struct
+static const struct
 {
     vlc_fourcc_t i_fourcc;
     const char *psz_type;
@@ -654,7 +654,7 @@ static void AVI_ChunkFree_nothing( avi_chunk_t *p_chk )
     VLC_UNUSED( p_chk );
 }
 
-static struct
+static const struct
 {
     vlc_fourcc_t i_fourcc;
     int   (*AVI_ChunkRead_function)( stream_t *s, avi_chunk_t *p_chk );