RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
rfelker 2004-04-30 10:26:26 +00:00
parent e2cb513292
commit 92aa4728d6
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libmpcodecs/ad_qtaudio.c
View File

@ -7,6 +7,7 @@
#include "../mp_msg.h" #include "../mp_msg.h"
#if defined(USE_QTX_CODECS) || defined(MACOSX) #if defined(USE_QTX_CODECS) || defined(MACOSX)
#include "wine/windef.h"
#include "ad_internal.h" #include "ad_internal.h"
#include "bswap.h" #include "bswap.h"

1
libmpcodecs/ad_realaud.c
View File

@ -14,6 +14,7 @@
#include "help_mp.h" #include "help_mp.h"
#include "ad_internal.h" #include "ad_internal.h"
#include "wine/windef.h"
static ad_info_t info = { static ad_info_t info = {
"RealAudio decoder", "RealAudio decoder",

1
libmpcodecs/vd_qtvideo.c
View File

@ -4,6 +4,7 @@
#include "config.h" #include "config.h"
#if defined(USE_QTX_CODECS) || defined(MACOSX) #if defined(USE_QTX_CODECS) || defined(MACOSX)
#include "wine/windef.h"
#include "mp_msg.h" #include "mp_msg.h"
#include "vd_internal.h" #include "vd_internal.h"

1
libmpcodecs/vd_realvid.c
View File

@ -12,6 +12,7 @@
#include "help_mp.h" #include "help_mp.h"
#include "vd_internal.h" #include "vd_internal.h"
#include "wine/windef.h"
static vd_info_t info = { static vd_info_t info = {
"RealVideo decoder", "RealVideo decoder",

8
libmpdemux/aviheader.h
View File

@ -27,8 +27,8 @@
#define aviTWOCC(ch0, ch1) ((uint16_t)(uint8_t)(ch0) | ((uint16_t)(uint8_t)(ch1) << 8)) #define aviTWOCC(ch0, ch1) ((uint16_t)(uint8_t)(ch0) | ((uint16_t)(uint8_t)(ch1) << 8))
#endif #endif
typedef uint16_t TWOCC; //typedef uint16_t TWOCC;
typedef uint32_t FOURCC; //typedef uint32_t FOURCC;
/* form types, list types, and chunk types */ /* form types, list types, and chunk types */
#define formtypeAVI mmioFOURCC('A', 'V', 'I', ' ') #define formtypeAVI mmioFOURCC('A', 'V', 'I', ' ')
@ -96,8 +96,8 @@ typedef struct rectangle_t {
} rectangle_t; } rectangle_t;
typedef struct { typedef struct {
FOURCC fccType; uint32_t fccType;
FOURCC fccHandler; uint32_t fccHandler;
uint32_t dwFlags; /* Contains AVITF_* flags */ uint32_t dwFlags; /* Contains AVITF_* flags */
uint16_t wPriority; uint16_t wPriority;
uint16_t wLanguage; uint16_t wLanguage;

2
loader/wine/mmreg.h
View File

@ -83,6 +83,7 @@ typedef struct {
} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
#endif // !_WAVEFORMATEXTENSIBLE_ #endif // !_WAVEFORMATEXTENSIBLE_
/*
typedef struct mpeglayer3waveformat_tag { typedef struct mpeglayer3waveformat_tag {
WORD wFormatTag WINE_PACKED; WORD wFormatTag WINE_PACKED;
WORD nChannels WINE_PACKED; WORD nChannels WINE_PACKED;
@ -97,6 +98,7 @@ typedef struct mpeglayer3waveformat_tag {
WORD nFramesPerBlock WINE_PACKED; WORD nFramesPerBlock WINE_PACKED;
WORD nCodecDelay WINE_PACKED; WORD nCodecDelay WINE_PACKED;
} MPEGLAYER3WAVEFORMAT; } MPEGLAYER3WAVEFORMAT;
*/
/* WAVE form wFormatTag IDs */ /* WAVE form wFormatTag IDs */