[MPlayer-cvslog] r30348 - trunk/loader/dshow/guids.h

[reimar]

Author: reimar
Date: Sun Jan 17 14:28:29 2010
New Revision: 30348

Log:
Hack to avoid a GUID_NULL clash on 64 bit MinGW.

Modified:
   trunk/loader/dshow/guids.h

Modified: trunk/loader/dshow/guids.h
==============================================================================
--- trunk/loader/dshow/guids.h	Sun Jan 17 14:18:59 2010	(r30347)
+++ trunk/loader/dshow/guids.h	Sun Jan 17 14:28:29 2010	(r30348)
@@ -56,6 +56,8 @@ extern const GUID IID_IDivxFilterInterfa
 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;