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

View File

@ -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"

View File

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

View File

@ -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"

View File

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

View File

@ -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;

View File

@ -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 */