Mercurial > mplayer.hg

changeset 30306:d0b5ec16fb23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hack to avoid a GUID_NULL clash on 64 bit MinGW.
author reimar
date Sun, 17 Jan 2010 13:28:29 +0000
parents fd0de0336717
children 63ff519cc9f1
files loader/dshow/guids.h
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
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;