diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-30 10:26:26 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-30 10:26:26 +0000 |
| commit | 92aa4728d62c091177bc46af8029731f4203b1be (patch) | |
| tree | 66b1a8a09694558c205f740e6e5e6592c9ae8c45 /libmpdemux/aviheader.h | |
| parent | e2cb51329286aeaf30da0fb417959d4667d0c726 (diff) | |
| download | mpv-92aa4728d62c091177bc46af8029731f4203b1be.tar.bz2 mpv-92aa4728d62c091177bc46af8029731f4203b1be.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12357 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/aviheader.h')
| -rw-r--r-- | libmpdemux/aviheader.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 6070646119..021cdd1bbe 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -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 @@ typedef struct rectangle_t { } 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; |