summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-02-25 07:32:40 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-02-25 07:32:40 (GMT)
commit4124bff7eb55ca2026bb89198950991a0804d0e6 (patch)
treee900aa7dd7eee878e0914fd410e3cde44bb57465 /src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
parent44accdad194251062be74aeafac2cc9d856df479 (diff)
downloadQt-4124bff7eb55ca2026bb89198950991a0804d0e6.zip
Qt-4124bff7eb55ca2026bb89198950991a0804d0e6.tar.gz
Qt-4124bff7eb55ca2026bb89198950991a0804d0e6.tar.bz2
Make the Direct Show media service compile with mingw.
There a number of interfaces and guid constants used by the media service that aren't defined by mingw. Define these locally. Reviewed-by: Justin McPherson
Diffstat (limited to 'src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp')
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
index a33041e..89821c4 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp
@@ -297,7 +297,7 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimedia::MetaData key) const
}
if (string) {
- value = QString::fromUtf16(string, ::SysStringLen(string));
+ value = QString::fromUtf16(reinterpret_cast<ushort *>(string), ::SysStringLen(string));
::SysFreeString(string);
}