diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 03:01:25 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 03:01:25 +0100 |
| commit | b0e1f01ce01e73e82f16d30202e56395223e138c (patch) | |
| tree | c067a51730cf8d6f9e2df7479a79f82498f2200a /src/plugins/common/evr | |
| parent | 3fa7144030267d787ecb739c0d6bc81bfe94cc8a (diff) | |
| parent | 2c974280aa8c40d29ec89bdc73bc6bf384c010c9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Iab78b2e3bac2b107273068dca2d9130133486b62
Diffstat (limited to 'src/plugins/common/evr')
| -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; |