Mercurial > mplayer.hg
diff 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 |
line wrap: on
line diff
--- a/loader/dshow/guids.h Sun Jan 17 13:18:59 2010 +0000 +++ b/loader/dshow/guids.h Sun Jan 17 13:28:29 2010 +0000 @@ -56,6 +56,8 @@ 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;