diff options
| author | Doris Verria <doris.verria@qt.io> | 2022-11-01 15:23:10 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-01 22:25:02 +0000 |
| commit | 3582462ff943447013e0d271eda39598b6a7c96f (patch) | |
| tree | cf3ce32448f851f0e19efa888865139c808fdfb2 | |
| parent | d6b9c7465f579d7c2635e65e06a7df1c5e3d3033 (diff) | |
| download | qtmultimedia-3582462ff943447013e0d271eda39598b6a7c96f.tar.gz | |
Fix iOS build
Include right headers for macOS and iOS.
Change-Id: Ibd1875963a85846ed92267d09385fa17305b2fc3
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 768f6b1064d944824f93cbb5b88cfcf6bbdb905a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm | 3 | ||||
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox_p.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm index 7078c8f23..db64f2003 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm @@ -19,8 +19,9 @@ #include <CoreVideo/CVMetalTextureCache.h> #include <qopenglcontext.h> - +#ifdef Q_OS_MACOS #import <AppKit/AppKit.h> +#endif #import <Metal/Metal.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox_p.h b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox_p.h index f618d5dd9..44fa32dd2 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox_p.h +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox_p.h @@ -23,7 +23,11 @@ #include <CoreVideo/CVImageBuffer.h> #include <CoreVideo/CVMetalTexture.h> +#if defined(Q_OS_MACOS) #include <CoreVideo/CVOpenGLTextureCache.h> +#elif defined(Q_OS_IOS) +#include <CoreVideo/CVOpenGLESTextureCache.h> +#endif QT_BEGIN_NAMESPACE |