[Mplayer-cvslog] CVS: main/libmpdemux aviheader.h,1.10,1.11

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv30320/libmpdemux

Modified Files:
	aviheader.h 
Log Message:
minimal fix for alex's 1000000000000l compile errors. imo the fix in
aviheader.h is totally correct. defining useless typedefs that can
conflict with other headers is bad practice. i don't like editing
mmreg.h but oh well... if you have a better fix, commit it! finally,
the fix in the ad_ and vd_ files seems totally correct.


Index: aviheader.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aviheader.h	29 Apr 2004 07:36:19 -0000	1.10
+++ aviheader.h	30 Apr 2004 10:26:26 -0000	1.11
@@ -27,8 +27,8 @@
 #define aviTWOCC(ch0, ch1) ((uint16_t)(uint8_t)(ch0) | ((uint16_t)(uint8_t)(ch1) << 8))
 #endif
 
-typedef uint16_t TWOCC;
-typedef uint32_t FOURCC;
+//typedef uint16_t TWOCC;
+//typedef uint32_t FOURCC;
 
 /* form types, list types, and chunk types */
 #define formtypeAVI             mmioFOURCC('A', 'V', 'I', ' ')
@@ -96,8 +96,8 @@
 } rectangle_t;
 
 typedef struct {
-    FOURCC		fccType;
-    FOURCC		fccHandler;
+    uint32_t		fccType;
+    uint32_t		fccHandler;
     uint32_t		dwFlags;	/* Contains AVITF_* flags */
     uint16_t		wPriority;
     uint16_t		wLanguage;