diff options
| -rw-r--r-- | libmpcodecs/ad_qtaudio.c | 1 | ||||
| -rw-r--r-- | libmpcodecs/ad_realaud.c | 1 | ||||
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 1 | ||||
| -rw-r--r-- | libmpcodecs/vd_realvid.c | 1 | ||||
| -rw-r--r-- | libmpdemux/aviheader.h | 8 | ||||
| -rw-r--r-- | loader/wine/mmreg.h | 2 |
6 files changed, 10 insertions, 4 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index f9a4618395..7ccdfb98ee 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -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" diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index c7b5389f24..c1a7d8c643 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -14,6 +14,7 @@ #include "help_mp.h" #include "ad_internal.h" +#include "wine/windef.h" static ad_info_t info = { "RealAudio decoder", diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 099edb5c35..2bd96f268c 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -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" diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index 5f6669bd95..031b841de3 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -12,6 +12,7 @@ #include "help_mp.h" #include "vd_internal.h" +#include "wine/windef.h" static vd_info_t info = { "RealVideo decoder", 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; diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h index e59ae0a474..b75e34882f 100644 --- a/loader/wine/mmreg.h +++ b/loader/wine/mmreg.h @@ -83,6 +83,7 @@ typedef struct { } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; #endif // !_WAVEFORMATEXTENSIBLE_ +/* typedef struct mpeglayer3waveformat_tag { WORD wFormatTag WINE_PACKED; WORD nChannels WINE_PACKED; @@ -97,6 +98,7 @@ typedef struct mpeglayer3waveformat_tag { WORD nFramesPerBlock WINE_PACKED; WORD nCodecDelay WINE_PACKED; } MPEGLAYER3WAVEFORMAT; +*/ /* WAVE form wFormatTag IDs */ |