From: 52c3e9c0f140a8742034e107fb0f371c0d73bf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org> Date: Sun, 12 Sep 2021 04:20:11 +0200 Subject: [PATCH] chromium-93: fix building with system-ffmpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The version of ffmpeg bundled in Chromium changed ABI a little, which affected the code in that the type of the last parameter of av_packet_get_side_data() is now size_t instead of int. This causes Chromium to fail to build with system-ffmpeg if the system ffmpeg's version does not yet have this ABI change. Fix the code to be able to compile with older ffmpeg as well. Signed-off-by: Marek BehĂșn <kabel@kernel.org> squidf: for Mageia and Chromium 100, chromium-ffmpeg-lp152.patch merged here. --- diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc --- a/media/filters/audio_decoder_unittest.cc +++ b/media/filters/audio_decoder_unittest.cc @@ -109,7 +109,11 @@ void SetDiscardPadding(AVPacket* packet, } // If the timestamp is positive, try to use FFmpeg's discard data. +#if LIBAVUTIL_VERSION_MAJOR < 57 + int skip_samples_size = 0; +#else size_t skip_samples_size = 0; +#endif const uint32_t* skip_samples_ptr = reinterpret_cast<const uint32_t*>(av_packet_get_side_data( packet, AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size)); --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -50,7 +50,13 @@ #include "media/formats/webm/webm_crypto_helpers.h" #include "media/media_buildflags.h" #include "third_party/ffmpeg/ffmpeg_features.h" +#include <libavcodec/version.h> +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 78, 100) #include "third_party/ffmpeg/libavcodec/packet.h" +#else +#include "third_party/ffmpeg/libavcodec/avcodec.h" +#endif + #if BUILDFLAG(ENABLE_PLATFORM_HEVC) #include "media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h"