diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
| commit | 4ebf0075806ccf2bdde276a4e56eac41c7e350c4 (patch) | |
| tree | 89b4572543527808c92f4e37448bca4012e926ad /loader | |
| parent | efd25f7811b232ae2b1899ca0fee6fd598837b9f (diff) | |
| parent | c2ba58aefce038ce4ccf6ed23791f5de823aa041 (diff) | |
| download | mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.bz2 mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.xz | |
Merge svn changes up to r30375
Diffstat (limited to 'loader')
| -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; |