Mercurial > mplayer.hg
comparison loader/dshow/guids.h @ 30306:d0b5ec16fb23
Hack to avoid a GUID_NULL clash on 64 bit MinGW.
author | reimar |
---|---|
date | Sun, 17 Jan 2010 13:28:29 +0000 |
parents | 008338d7679f |
children | c121d03db8b9 |
comparison
equal
deleted
inserted
replaced
30305:fd0de0336717 | 30306:d0b5ec16fb23 |
---|---|
54 extern const GUID CLSID_DivxDecompressorCF; | 54 extern const GUID CLSID_DivxDecompressorCF; |
55 extern const GUID IID_IDivxFilterInterface; | 55 extern const GUID IID_IDivxFilterInterface; |
56 extern const GUID CLSID_IV50_Decoder; | 56 extern const GUID CLSID_IV50_Decoder; |
57 extern const GUID CLSID_MemoryAllocator; | 57 extern const GUID CLSID_MemoryAllocator; |
58 extern const GUID MEDIATYPE_Video; | 58 extern const GUID MEDIATYPE_Video; |
59 // avoid a clash with MinGW-W64 libuuid | |
60 #define GUID_NULL MP_GUID_NULL | |
59 extern const GUID GUID_NULL; | 61 extern const GUID GUID_NULL; |
60 extern const GUID FORMAT_VideoInfo; | 62 extern const GUID FORMAT_VideoInfo; |
61 extern const GUID MEDIASUBTYPE_RGB1; | 63 extern const GUID MEDIASUBTYPE_RGB1; |
62 extern const GUID MEDIASUBTYPE_RGB4; | 64 extern const GUID MEDIASUBTYPE_RGB4; |
63 extern const GUID MEDIASUBTYPE_RGB8; | 65 extern const GUID MEDIASUBTYPE_RGB8; |