diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-08-15 12:01:22 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-15 15:12:51 +0000 |
| commit | e1215c6503db856304b4b0740bab5c689b477546 (patch) | |
| tree | 01f7d69621c3215e702fd27b183f95e4d7f37c57 | |
| parent | 73f9897c31821698a7484bc66a404b5d76fed47d (diff) | |
Fix build with older FFmpeg
Amend fa6f7bf67df6980d45c66c9018a42c154399b8f0 to fix builds
with older FFmpeg versions, some of the defines are available
only after FFmpeg n4.4.
Change-Id: I2a86699a06e4e260051682f8deac2d03e9c7480c
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 7adc9509d3f4a08d81a9fbf40334bdbb14e48c01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpeg.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp index 55f4c859a..eb16bf431 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp @@ -91,13 +91,17 @@ static void dumpCodecInfo(const AVCodec *codec) { AV_CODEC_CAP_FRAME_THREADS, "FRAME_THREADS" }, { AV_CODEC_CAP_SLICE_THREADS, "SLICE_THREADS" }, { AV_CODEC_CAP_PARAM_CHANGE, "PARAM_CHANGE" }, +#ifdef AV_CODEC_CAP_OTHER_THREADS { AV_CODEC_CAP_OTHER_THREADS, "OTHER_THREADS" }, +#endif { AV_CODEC_CAP_VARIABLE_FRAME_SIZE, "VARIABLE_FRAME_SIZE" }, { AV_CODEC_CAP_AVOID_PROBING, "AVOID_PROBING" }, { AV_CODEC_CAP_HARDWARE, "HARDWARE" }, { AV_CODEC_CAP_HYBRID, "HYBRID" }, { AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, "ENCODER_REORDERED_OPAQUE" }, +#ifdef AV_CODEC_CAP_ENCODER_FLUSH { AV_CODEC_CAP_ENCODER_FLUSH, "ENCODER_FLUSH" }, +#endif }; qCDebug(qLcFFmpegUtils) << mediaType << type << codec->name << "id:" << codec->id |