diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-17 13:28:29 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-17 13:28:29 +0000 |
commit | 8afef4e19ca476e4f7e5b56e65e7ab59409d285d (patch) | |
tree | d28b29f8470e650472ec33b2629673d3d010257e /loader/dshow | |
parent | 77af8d08592dbcb80ed87336b630507639a16d38 (diff) | |
download | mpv-8afef4e19ca476e4f7e5b56e65e7ab59409d285d.tar.bz2 mpv-8afef4e19ca476e4f7e5b56e65e7ab59409d285d.tar.xz |
Hack to avoid a GUID_NULL clash on 64 bit MinGW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30348 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dshow')
-rw-r--r-- | loader/dshow/guids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/loader/dshow/guids.h b/loader/dshow/guids.h index 5bf335f907..80686558b4 100644 --- a/loader/dshow/guids.h +++ b/loader/dshow/guids.h @@ -56,6 +56,8 @@ extern const GUID IID_IDivxFilterInterface; extern const GUID CLSID_IV50_Decoder; extern const GUID CLSID_MemoryAllocator; extern const GUID MEDIATYPE_Video; +// avoid a clash with MinGW-W64 libuuid +#define GUID_NULL MP_GUID_NULL extern const GUID GUID_NULL; extern const GUID FORMAT_VideoInfo; extern const GUID MEDIASUBTYPE_RGB1; |