* modules/demux/avi/*: should theoretically fix the endianness issues with

   the avi demuxer.

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index b9f01bcf2466086acd31b9da74ac2c146c0d01a8..06d8a2247fcb368fb545df09bf841245c6ca2814 100644 (file)
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -2,7 +2,7 @@
  * libavi.c : 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libavi.c,v 1.4 2002/11/05 10:07:56 gbazin Exp $
+ * $Id: libavi.c,v 1.5 2002/11/05 23:48:46 gbazin Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -32,10 +32,10 @@
 
 #define AVI_DEBUG 1
 #define AVIFOURCC_PRINT( x ) \
-    (x)&0xff,           \
-    ( (x) >>  8 )&0xff, \
-    ( (x) >> 16 )&0xff, \
-    ( (x) >> 24 )&0xff
+    ((u8 *)&x)[0],           \
+    ((u8 *)&x)[1],           \
+    ((u8 *)&x)[2],           \
+    ((u8 *)&x)[3]
     
 #define FREE( p ) \
     if( p ) {free( p ); p = NULL; }
@@ -868,7 +868,7 @@ int AVI_ChunkReadRoot( input_thread_t *p_input,
     p_list->p_first = NULL;
     p_list->p_last  = NULL;
 
-    p_list->i_type = MKFOURCC( 'r', 'o', 'o', 't' );
+    p_list->i_type = VLC_FOURCC( 'r', 'o', 'o', 't' );
     
     for( ; ; )
     {

diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index 6ca10ed07a238132e6493e902883cf1478fc5137..677eddba83f0a6c396e5f51e4191abb914a755fe 100644 (file)
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -2,7 +2,7 @@
  * libavi.h : LibAVI library 
  ******************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libavi.h,v 1.2 2002/11/05 10:07:56 gbazin Exp $
+ * $Id: libavi.h,v 1.3 2002/11/05 23:48:46 gbazin Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -39,65 +39,61 @@
 #define AVIIF_FIXKEYFRAME   0x00001000L /* invented; used to say that 
                                            the keyframe flag isn't a true flag
                                            but have to be verified */
-#define MKFOURCC( a, b, c, d ) \
-    ( ((u32)a) | ( ((u32)b) << 8 ) | ( ((u32)c) << 16 ) | ( ((u32)d) << 24 ) )
-#define MKTWOCC( a, b ) \
-    ( (u16)(a) | ( (u16)(b) << 8 ) )
 
     /* *** avi stuff *** */
 
-#define AVIFOURCC_RIFF         MKFOURCC('R','I','F','F')
-#define AVIFOURCC_LIST         MKFOURCC('L','I','S','T')
-#define AVIFOURCC_JUNK         MKFOURCC('J','U','N','K')
-#define AVIFOURCC_AVI          MKFOURCC('A','V','I',' ')
-#define AVIFOURCC_WAVE         MKFOURCC('W','A','V','E')
-#define AVIFOURCC_INFO         MKFOURCC('I','N','F','O')
-
-#define AVIFOURCC_avih         MKFOURCC('a','v','i','h')
-#define AVIFOURCC_hdrl         MKFOURCC('h','d','r','l')
-#define AVIFOURCC_movi         MKFOURCC('m','o','v','i')
-#define AVIFOURCC_idx1         MKFOURCC('i','d','x','1')
-
-#define AVIFOURCC_strl         MKFOURCC('s','t','r','l')
-#define AVIFOURCC_strh         MKFOURCC('s','t','r','h')
-#define AVIFOURCC_strf         MKFOURCC('s','t','r','f')
-#define AVIFOURCC_strd         MKFOURCC('s','t','r','d')
-
-#define AVIFOURCC_rec          MKFOURCC('r','e','c',' ')
-#define AVIFOURCC_auds         MKFOURCC('a','u','d','s')
-#define AVIFOURCC_vids         MKFOURCC('v','i','d','s')
-
-#define AVIFOURCC_IARL         MKFOURCC('I','A','R','L')
-#define AVIFOURCC_IART         MKFOURCC('I','A','R','T')
-#define AVIFOURCC_ICMS         MKFOURCC('I','C','M','S')
-#define AVIFOURCC_ICMT         MKFOURCC('I','C','M','T')
-#define AVIFOURCC_ICOP         MKFOURCC('I','C','O','P')
-#define AVIFOURCC_ICRD         MKFOURCC('I','C','R','D')
-#define AVIFOURCC_ICRP         MKFOURCC('I','C','R','P')
-#define AVIFOURCC_IDIM         MKFOURCC('I','D','I','M')
-#define AVIFOURCC_IDPI         MKFOURCC('I','D','P','I')
-#define AVIFOURCC_IENG         MKFOURCC('I','E','N','G')
-#define AVIFOURCC_IGNR         MKFOURCC('I','G','N','R')
-#define AVIFOURCC_IKEY         MKFOURCC('I','K','E','Y')
-#define AVIFOURCC_ILGT         MKFOURCC('I','L','G','T')
-#define AVIFOURCC_IMED         MKFOURCC('I','M','E','D')
-#define AVIFOURCC_INAM         MKFOURCC('I','N','A','M')
-#define AVIFOURCC_IPLT         MKFOURCC('I','P','L','T')
-#define AVIFOURCC_IPRD         MKFOURCC('I','P','R','D')
-#define AVIFOURCC_ISBJ         MKFOURCC('I','S','B','J')
-#define AVIFOURCC_ISFT         MKFOURCC('I','S','F','T')
-#define AVIFOURCC_ISHP         MKFOURCC('I','S','H','P')
-#define AVIFOURCC_ISRC         MKFOURCC('I','S','R','C')
-#define AVIFOURCC_ISRF         MKFOURCC('I','S','R','F')
-#define AVIFOURCC_ITCH         MKFOURCC('I','T','C','H')
-#define AVIFOURCC_ISMP         MKFOURCC('I','S','M','P')
-#define AVIFOURCC_IDIT         MKFOURCC('I','D','I','T')
+#define AVIFOURCC_RIFF         VLC_FOURCC('R','I','F','F')
+#define AVIFOURCC_LIST         VLC_FOURCC('L','I','S','T')
+#define AVIFOURCC_JUNK         VLC_FOURCC('J','U','N','K')
+#define AVIFOURCC_AVI          VLC_FOURCC('A','V','I',' ')
+#define AVIFOURCC_WAVE         VLC_FOURCC('W','A','V','E')
+#define AVIFOURCC_INFO         VLC_FOURCC('I','N','F','O')
+
+#define AVIFOURCC_avih         VLC_FOURCC('a','v','i','h')
+#define AVIFOURCC_hdrl         VLC_FOURCC('h','d','r','l')
+#define AVIFOURCC_movi         VLC_FOURCC('m','o','v','i')
+#define AVIFOURCC_idx1         VLC_FOURCC('i','d','x','1')
+
+#define AVIFOURCC_strl         VLC_FOURCC('s','t','r','l')
+#define AVIFOURCC_strh         VLC_FOURCC('s','t','r','h')
+#define AVIFOURCC_strf         VLC_FOURCC('s','t','r','f')
+#define AVIFOURCC_strd         VLC_FOURCC('s','t','r','d')
+
+#define AVIFOURCC_rec          VLC_FOURCC('r','e','c',' ')
+#define AVIFOURCC_auds         VLC_FOURCC('a','u','d','s')
+#define AVIFOURCC_vids         VLC_FOURCC('v','i','d','s')
+
+#define AVIFOURCC_IARL         VLC_FOURCC('I','A','R','L')
+#define AVIFOURCC_IART         VLC_FOURCC('I','A','R','T')
+#define AVIFOURCC_ICMS         VLC_FOURCC('I','C','M','S')
+#define AVIFOURCC_ICMT         VLC_FOURCC('I','C','M','T')
+#define AVIFOURCC_ICOP         VLC_FOURCC('I','C','O','P')
+#define AVIFOURCC_ICRD         VLC_FOURCC('I','C','R','D')
+#define AVIFOURCC_ICRP         VLC_FOURCC('I','C','R','P')
+#define AVIFOURCC_IDIM         VLC_FOURCC('I','D','I','M')
+#define AVIFOURCC_IDPI         VLC_FOURCC('I','D','P','I')
+#define AVIFOURCC_IENG         VLC_FOURCC('I','E','N','G')
+#define AVIFOURCC_IGNR         VLC_FOURCC('I','G','N','R')
+#define AVIFOURCC_IKEY         VLC_FOURCC('I','K','E','Y')
+#define AVIFOURCC_ILGT         VLC_FOURCC('I','L','G','T')
+#define AVIFOURCC_IMED         VLC_FOURCC('I','M','E','D')
+#define AVIFOURCC_INAM         VLC_FOURCC('I','N','A','M')
+#define AVIFOURCC_IPLT         VLC_FOURCC('I','P','L','T')
+#define AVIFOURCC_IPRD         VLC_FOURCC('I','P','R','D')
+#define AVIFOURCC_ISBJ         VLC_FOURCC('I','S','B','J')
+#define AVIFOURCC_ISFT         VLC_FOURCC('I','S','F','T')
+#define AVIFOURCC_ISHP         VLC_FOURCC('I','S','H','P')
+#define AVIFOURCC_ISRC         VLC_FOURCC('I','S','R','C')
+#define AVIFOURCC_ISRF         VLC_FOURCC('I','S','R','F')
+#define AVIFOURCC_ITCH         VLC_FOURCC('I','T','C','H')
+#define AVIFOURCC_ISMP         VLC_FOURCC('I','S','M','P')
+#define AVIFOURCC_IDIT         VLC_FOURCC('I','D','I','T')
 
     
-#define AVITWOCC_wb            MKTWOCC('w','b')
-#define AVITWOCC_db            MKTWOCC('d','b')
-#define AVITWOCC_dc            MKTWOCC('d','c')
-#define AVITWOCC_pc            MKTWOCC('p','c')
+#define AVITWOCC_wb            VLC_TWOCC('w','b')
+#define AVITWOCC_db            VLC_TWOCC('d','b')
+#define AVITWOCC_dc            VLC_TWOCC('d','c')
+#define AVITWOCC_pc            VLC_TWOCC('p','c')
     /* *** codex stuff ***  */
 
     /* MPEG4 video */