2018-12-08 22:06:32 +01:00
|
|
|
From ab9f339dd836ece1b4b1c220b6fe6888852a8694 Mon Sep 17 00:00:00 2001
|
2018-09-19 20:39:07 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Mon, 24 Sep 2018 19:21:40 +0200
|
|
|
|
|
Subject: [PATCH 3/4] Prevent redefinition of MFVideoNormalizedRect
|
|
|
|
|
|
2018-12-08 22:06:32 +01:00
|
|
|
This establishes compatibility with MinGW-w64 headers 6.0
|
2018-09-19 20:39:07 +02:00
|
|
|
where MFVideoNormalizedRect has been added to evr.h.
|
2018-12-08 22:06:32 +01:00
|
|
|
|
|
|
|
|
Change-Id: Id4edec36c6bc9c50cadbeacc436382940973475c
|
2018-09-19 20:39:07 +02:00
|
|
|
---
|
|
|
|
|
src/plugins/common/evr/evrdefs.h | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h
|
|
|
|
|
index f898209b..a8d7f664 100644
|
|
|
|
|
--- a/src/plugins/common/evr/evrdefs.h
|
|
|
|
|
+++ b/src/plugins/common/evr/evrdefs.h
|
|
|
|
|
@@ -83,7 +83,7 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
|
|
|
|
|
#define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#ifdef __GNUC__
|
|
|
|
|
+#if defined(__GNUC__) && !defined(_MFVideoNormalizedRect_)
|
|
|
|
|
typedef struct MFVideoNormalizedRect {
|
|
|
|
|
float left;
|
|
|
|
|
float top;
|
|
|
|
|
--
|
2018-12-08 22:06:32 +01:00
|
|
|
2.19.2
|
2018-09-19 20:39:07 +02:00
|
|
|
|
