diff options
| author | Tim Blechmann <tim@klingt.org> | 2024-03-25 12:45:49 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-26 20:10:16 +0000 |
| commit | f495515e72dbdbccc0b2234a76218b99953a03d0 (patch) | |
| tree | 6249992dd2d3d1cb614f46d2b712d21a6aae25fb | |
| parent | 10d5015f1d6553e07b4968630b1879611373eef4 (diff) | |
FFMPEG: fix name clashed in unity builds
libavformat and AVFoundation clash
Pick-to: 6.5
Change-Id: Ifca94efd75210f05c8910c545c53acea1af25e26
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit bc35ebb78d96d0e144162922ec310060750ef3b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1c0d0ea72f13a38b174a8ed9eacd06a8e7fd2ea1)
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt index 418da3ee5..75109115d 100644 --- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt +++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt @@ -143,6 +143,10 @@ qt_internal_extend_target(QFFmpegMediaPlugin CONDITION APPLE qffmpeghwaccel_videotoolbox.mm qffmpeghwaccel_videotoolbox_p.h qavfcamera.mm qavfcamera_p.h qavfsamplebufferdelegate.mm qavfsamplebufferdelegate_p.h + + NO_UNITY_BUILD_SOURCES + qffmpeghwaccel_videotoolbox.mm # AVMediaType clash between libavformat and AVFoundation + INCLUDE_DIRECTORIES ../darwin ../darwin/camera |