GUID fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1837 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
1 parent
a4ed0ba9e2
commit
a62f04fbe3
2 files changed
+14
-3
No files matched your search
@@ -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];
|
||||
|
||||
+10
-3
@@ -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 */
|
||||
|
||||
|
||||
Reference in new issue
Block a user