diff options
| author | Marius Kittler <mariuskittler@gmx.de> | 2018-09-24 20:56:07 +0200 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2018-11-18 23:40:32 +0000 |
| commit | 2c974280aa8c40d29ec89bdc73bc6bf384c010c9 (patch) | |
| tree | 4abf34920df6a023343b4eb6242c5b09987d412a | |
| parent | fa5744670ce9c5fdee65a98337e4d6bb5146c981 (diff) | |
| download | qtmultimedia-2c974280aa8c40d29ec89bdc73bc6bf384c010c9.tar.gz | |
EVR: Prevent redefinition of MFVideoNormalizedRect
This establishes compatibility with MinGW-w64 headers 6.0
where MFVideoNormalizedRect has been added to evr.h.
Task-number: QTBUG-70630
Change-Id: I49ac49bf9eda8ea281d9da799785e56373ae8f01
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Reviewed-by: Marius Kittler <mariuskittler@gmx.de>
| -rw-r--r-- | src/plugins/common/evr/evrdefs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h index f898209b8..4f3dd832a 100644 --- a/src/plugins/common/evr/evrdefs.h +++ b/src/plugins/common/evr/evrdefs.h @@ -83,7 +83,8 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**); #define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L) #endif -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_MFVideoNormalizedRect_) +#define _MFVideoNormalizedRect_ typedef struct MFVideoNormalizedRect { float left; float top; |