diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-02 17:21:22 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-02 17:21:22 +0000 |
| commit | a62f04fbe3e39260faa9bb52bbdc3b75a8d2c46e (patch) | |
| tree | 63fa9607ed6c7b91e0b7bae57f7eba972f75d810 | |
| parent | a4ed0ba9e2f95815a9edbf654b4dce581fd5c986 (diff) | |
| download | mpv-a62f04fbe3e39260faa9bb52bbdc3b75a8d2c46e.tar.bz2 mpv-a62f04fbe3e39260faa9bb52bbdc3b75a8d2c46e.tar.xz | |
GUID fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1837 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | codec-cfg.h | 4 | ||||
| -rw-r--r-- | loader/wine/mmreg.h | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/codec-cfg.h b/codec-cfg.h index 6982954dac..29b046070d 100644 --- a/codec-cfg.h +++ b/codec-cfg.h @@ -38,12 +38,16 @@ #define VFM_DIVX4 7 #define VFM_RAW 8 +#ifndef GUID_TYPE +#define GUID_TYPE typedef struct { unsigned long f1; unsigned short f2; unsigned short f3; unsigned char f4[8]; } GUID; +#endif + typedef struct { unsigned int fourcc[CODECS_MAX_FOURCC]; diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h index bb13ba962a..32357d9db4 100644 --- a/loader/wine/mmreg.h +++ b/loader/wine/mmreg.h @@ -57,7 +57,16 @@ typedef struct _WAVEFORMATEX { } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ -#ifdef GUID_DEFINED +#ifndef GUID_TYPE +#define GUID_TYPE +typedef struct +{ + unsigned long f1; + unsigned short f2; + unsigned short f3; + unsigned char f4[8]; +} GUID; +#endif #ifndef _WAVEFORMATEXTENSIBLE_ #define _WAVEFORMATEXTENSIBLE_ @@ -93,8 +102,6 @@ typedef WAVEFORMATIEEEFLOATEX *PWAVEFORMATIEEEFLOATEX; typedef WAVEFORMATIEEEFLOATEX NEAR *NPWAVEFORMATIEEEFLOATEX; typedef WAVEFORMATIEEEFLOATEX FAR *LPWAVEFORMATIEEEFLOATEX; -#endif // GUID_DEFINED - /* WAVE form wFormatTag IDs */ |