summaryrefslogtreecommitdiffstats
path: root/src/qtmultimedia-1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/qtmultimedia-1.patch')
-rw-r--r--src/qtmultimedia-1.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/src/qtmultimedia-1.patch b/src/qtmultimedia-1.patch
new file mode 100644
index 0000000..e416fc9
--- /dev/null
+++ b/src/qtmultimedia-1.patch
@@ -0,0 +1,45 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 678830f6f5e3e9c8112a40983be7f9fefc3e91b3 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 13 Dec 2012 20:23:48 +0100
+Subject: [PATCH] remove duplicate defs (mxe-specific)
+
+
+diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+index e9503d4..b92aa98 100644
+--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
++++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+@@ -67,19 +67,19 @@ typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT;
+ #else
+
+ extern GUID CLSID_AudioInputDeviceCategory;
+-extern GUID CLSID_AudioRendererCategory;
+-extern GUID IID_ICreateDevEnum;
+-extern GUID CLSID_SystemDeviceEnum;
++//extern GUID CLSID_AudioRendererCategory;
++//extern GUID IID_ICreateDevEnum;
++//extern GUID CLSID_SystemDeviceEnum;
+
+ #ifndef __ICreateDevEnum_INTERFACE_DEFINED__
+ #define __ICreateDevEnum_INTERFACE_DEFINED__
+
+-DECLARE_INTERFACE_(ICreateDevEnum, IUnknown)
+-{
+- STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass,
+- IEnumMoniker **ppEnumMoniker,
+- DWORD dwFlags) PURE;
+-};
++//DECLARE_INTERFACE_(ICreateDevEnum, IUnknown)
++//{
++// STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass,
++// IEnumMoniker **ppEnumMoniker,
++// DWORD dwFlags) PURE;
++//};
+
+ #endif // __ICreateDevEnum_INTERFACE_DEFINED__
+
+--
+1.8.4.5
+