diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-09 16:59:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-10 13:57:19 +0000 |
| commit | 3bba710704bbd3f07e81b2552c75fb762f5aae9f (patch) | |
| tree | 3d845d01fa0cf6f7926e5a73bc446de0cd73e95c | |
| parent | b789116ca6111fa26c7a6d6ea22513b95c3573af (diff) | |
| download | qtwebengine-chromium-3bba710704bbd3f07e81b2552c75fb762f5aae9f.tar.gz | |
FIXUP: Fix building with system ffmpeg < 5.0
Change-Id: Ib5d252a900923acf321eee65e78538e83f7cbeef
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit b5afc89ed071fc7f5951ab87f4a1665fc041ff03)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | chromium/media/filters/ffmpeg_demuxer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc index 5939803c0ee..81630c537e3 100644 --- a/chromium/media/filters/ffmpeg_demuxer.cc +++ b/chromium/media/filters/ffmpeg_demuxer.cc @@ -66,7 +66,7 @@ void SetAVStreamDiscard(AVStream* stream, AVDiscard discard) { stream->discard = discard; } -#if BUILDFLAG(USE_SYSTEM_FFMPEG) +#if LIBAVCODEC_VERSION_MAJOR < 59 auto av_stream_get_first_dts(AVStream* stream) { return stream->first_dts; } @@ -408,7 +408,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { scoped_refptr<DecoderBuffer> buffer; -#if BUILDFLAG(USE_SYSTEM_FFMPEG) +#if LIBAVCODEC_VERSION_MAJOR < 59 typedef int side_data_arg; #else typedef size_t side_data_arg; |