2017-01-23 21:37:13 +01:00
|
|
|
From ecfcbb10eaae22d0887e074e3734d6d9e69d2e34 Mon Sep 17 00:00:00 2001
|
2016-09-19 22:18:45 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Sun, 25 Sep 2016 21:36:56 +0200
|
2016-11-06 12:49:43 +01:00
|
|
|
Subject: [PATCH 1/2] Recorder includes to prevent conflict with vsnprintf
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
|
Some files #include <dshow.h>
|
|
|
|
|
This is a C header which also #include's stdio.h which adds a #define vsnprintf
|
|
|
|
|
This #define vsnprint conflicts with QtCore/qstring.h so reorder the includes
|
|
|
|
|
a bit to prevent this situation
|
|
|
|
|
---
|
2017-01-23 21:37:13 +01:00
|
|
|
src/multimedia/video/qvideosurfaceformat.h | 1 +
|
|
|
|
|
src/plugins/directshow/helpers/directshowglobal.h | 1 +
|
|
|
|
|
2 files changed, 2 insertions(+)
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
|
diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h
|
2016-12-20 23:05:26 +01:00
|
|
|
index 83785ac0..25607d08 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/src/multimedia/video/qvideosurfaceformat.h
|
|
|
|
|
+++ b/src/multimedia/video/qvideosurfaceformat.h
|
|
|
|
|
@@ -44,6 +44,7 @@
|
|
|
|
|
#include <QtCore/qpair.h>
|
|
|
|
|
#include <QtCore/qshareddata.h>
|
|
|
|
|
#include <QtCore/qsize.h>
|
|
|
|
|
+#include <QtCore/qstring.h>
|
|
|
|
|
#include <QtGui/qimage.h>
|
|
|
|
|
#include <QtMultimedia/qvideoframe.h>
|
|
|
|
|
|
2017-01-23 21:37:13 +01:00
|
|
|
diff --git a/src/plugins/directshow/helpers/directshowglobal.h b/src/plugins/directshow/helpers/directshowglobal.h
|
2016-12-20 23:05:26 +01:00
|
|
|
index f7890c52..4f7c8213 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/src/plugins/directshow/helpers/directshowglobal.h
|
|
|
|
|
+++ b/src/plugins/directshow/helpers/directshowglobal.h
|
2016-09-19 22:18:45 +02:00
|
|
|
@@ -43,6 +43,7 @@
|
|
|
|
|
#include <dshow.h>
|
|
|
|
|
|
|
|
|
|
#include <QtCore/qglobal.h>
|
|
|
|
|
+#include <QtCore/qstring.h>
|
|
|
|
|
|
|
|
|
|
template <typename T> T *com_cast(IUnknown *unknown, const IID &iid)
|
|
|
|
|
{
|
|
|
|
|
--
|
2016-12-20 23:05:26 +01:00
|
|
|
2.11.0
|
2016-09-19 22:18:45 +02:00
|
|
|
|
