Mercurial > mplayer.hg

diff libmpdemux/aviheader.h @ 12356:6a61d694f7d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author rfelker
date Fri, 30 Apr 2004 10:26:26 +0000
parents 886fe66a2b2d
children 13e138957b7a
line wrap: on
line diff
--- a/libmpdemux/aviheader.h	Fri Apr 30 10:07:52 2004 +0000
+++ b/libmpdemux/aviheader.h	Fri Apr 30 10:26:26 2004 +0000
@@ -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;