From: Arun Kumar Pariyar Date: Mon, 17 Feb 2025 15:45:57 -0500 Subject: Fix ftbfs with ffmpeg 7 Bug-Debian: https://bugs.debian.org/1078276 Last-Update: 2024-09-14 Last-Update: 2024-09-14 --- src/album/imageengine/movieservice.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/album/imageengine/movieservice.cpp b/src/album/imageengine/movieservice.cpp index 0c7792b..e13f30b 100644 --- a/src/album/imageengine/movieservice.cpp +++ b/src/album/imageengine/movieservice.cpp @@ -36,7 +36,7 @@ extern "C" { #define THUMBNAIL_SIZE 500 #define SEEK_TIME "00:00:01" - +#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) MovieService *MovieService::m_movieService = nullptr; typedef int (*mvideo_avformat_open_input)(AVFormatContext **ps, const char *url, AVInputFormat *fmt, AVDictionary **options); @@ -185,7 +185,11 @@ MovieInfo MovieService::parseFromFile(const QFileInfo &fi) mi.aCodeID = audio_dec_ctx->codec_id; mi.aCodeRate = audio_dec_ctx->bit_rate; mi.aDigit = audio_dec_ctx->format; - mi.channels = audio_dec_ctx->channels; + #if HAVE_CH_LAYOUT + mi.channels = audio_dec_ctx->ch_layout.nb_channels; + #else + mi.channels = audio_dec_ctx->channels; + #endif mi.sampling = audio_dec_ctx->sample_rate; }