From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 19 Jun 2024 06:36:40 +0000 (+0200)
Subject: ffmpeg: fix libavutil version check for AVFrame.ch_layout
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29b4e116263c946e37b87fb50edd0da653159ae6;p=vlc.git

ffmpeg: fix libavutil version check for AVFrame.ch_layout

It was added in db6efa1815e217ed76f39aee8b15ee5c64698537 which
was libavutil 57.23.100 at the time but the minor version was not updated in
that commit so we check 57.24.100.

This is part of FFmpeg 5.1.

https://github.com/FFmpeg/FFmpeg/commit/db6efa1815e217ed76f39aee8b15ee5c64698537
(cherry picked from commit f237155887f049f8befef2fdfadae7b60f697b0d)

Gbp-Pq: Name 0095-ffmpeg-fix-libavutil-version-check-for-AVFrame.ch_la.patch
---

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index fb22f033..c27771ae 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -407,7 +407,7 @@ static int DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         ret = avcodec_receive_frame( ctx, frame );
         if( ret == 0 )
         {
-#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
+#if LIBAVUTIL_VERSION_CHECK(57, 24, 100)
             int channels = frame->ch_layout.nb_channels;
 #else
             int channels = ctx->channels;