Mercurial > mplayer.hg
changeset 12356:6a61d694f7d3
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 | ba3b91392d92 |
| children | 13e138957b7a |
| files | libmpcodecs/ad_qtaudio.c libmpcodecs/ad_realaud.c libmpcodecs/vd_qtvideo.c libmpcodecs/vd_realvid.c libmpdemux/aviheader.h loader/wine/mmreg.h |
| diffstat | 6 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_qtaudio.c Fri Apr 30 10:07:52 2004 +0000 +++ b/libmpcodecs/ad_qtaudio.c Fri Apr 30 10:26:26 2004 +0000 @@ -7,6 +7,7 @@ #include "../mp_msg.h" #if defined(USE_QTX_CODECS) || defined(MACOSX) +#include "wine/windef.h" #include "ad_internal.h" #include "bswap.h"
--- a/libmpcodecs/ad_realaud.c Fri Apr 30 10:07:52 2004 +0000 +++ b/libmpcodecs/ad_realaud.c Fri Apr 30 10:26:26 2004 +0000 @@ -14,6 +14,7 @@ #include "help_mp.h" #include "ad_internal.h" +#include "wine/windef.h" static ad_info_t info = { "RealAudio decoder",
--- a/libmpcodecs/vd_qtvideo.c Fri Apr 30 10:07:52 2004 +0000 +++ b/libmpcodecs/vd_qtvideo.c Fri Apr 30 10:26:26 2004 +0000 @@ -4,6 +4,7 @@ #include "config.h" #if defined(USE_QTX_CODECS) || defined(MACOSX) +#include "wine/windef.h" #include "mp_msg.h" #include "vd_internal.h"
--- a/libmpcodecs/vd_realvid.c Fri Apr 30 10:07:52 2004 +0000 +++ b/libmpcodecs/vd_realvid.c Fri Apr 30 10:26:26 2004 +0000 @@ -12,6 +12,7 @@ #include "help_mp.h" #include "vd_internal.h" +#include "wine/windef.h" static vd_info_t info = { "RealVideo decoder",
--- 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;
--- a/loader/wine/mmreg.h Fri Apr 30 10:07:52 2004 +0000 +++ b/loader/wine/mmreg.h Fri Apr 30 10:26:26 2004 +0000 @@ -83,6 +83,7 @@ } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; #endif // !_WAVEFORMATEXTENSIBLE_ +/* typedef struct mpeglayer3waveformat_tag { WORD wFormatTag WINE_PACKED; WORD nChannels WINE_PACKED; @@ -97,6 +98,7 @@ WORD nFramesPerBlock WINE_PACKED; WORD nCodecDelay WINE_PACKED; } MPEGLAYER3WAVEFORMAT; +*/ /* WAVE form wFormatTag IDs */