From b5afc89ed071fc7f5951ab87f4a1665fc041ff03 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 9 Mar 2022 16:59:34 +0100 Subject: FIXUP: Fix building with system ffmpeg < 5.0 Pick-to: 98-based 90-based Change-Id: Ib5d252a900923acf321eee65e78538e83f7cbeef Reviewed-by: Kirill Burtsev --- chromium/media/filters/ffmpeg_demuxer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc index c6bb0d9e867..742a5379719 100644 --- a/chromium/media/filters/ffmpeg_demuxer.cc +++ b/chromium/media/filters/ffmpeg_demuxer.cc @@ -65,7 +65,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; } @@ -409,7 +409,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { scoped_refptr buffer; -#if BUILDFLAG(USE_SYSTEM_FFMPEG) +#if LIBAVCODEC_VERSION_MAJOR < 59 typedef int side_data_arg; #else typedef size_t side_data_arg; -- cgit v1.2.3