From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 19 Jun 2024 11:41:04 +0000 (+0200)
Subject: avcodec: fix libavcodec version check for AVCodecContext.ch_layout
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=825f58cb59343d07aec1de103ac59f248f66fd06;p=vlc.git

avcodec: fix libavcodec version check for AVCodecContext.ch_layout

It was added in 548aeb93834b8425c86d1ce60fddc1d41805724d which
was libavcodec 59.23.100 at the time but the minor version was not updated in
that commit so we check 59.24.100.

This is part of FFmpeg 5.1.

https://github.com/FFmpeg/FFmpeg/commit/548aeb93834b8425c86d1ce60fddc1d41805724d

Co-authored-by: François Cartegnie <fcvlcdev@free.fr>
(cherry picked from commit 8fd918b8787b8d077decf1a2b955ab0c7b964bf3) (rebased)
rebased:
- on 3.0 fmt_in is not a pointer

Gbp-Pq: Name 0094-avcodec-fix-libavcodec-version-check-for-AVCodecCont.patch
---

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 979256c4..fb22f033 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -142,7 +142,7 @@ static int OpenAudioCodec( decoder_t *p_dec )
     }
 
     ctx->sample_rate = p_dec->fmt_in.audio.i_rate;
-#if LIBAVUTIL_VERSION_CHECK(57, 24, 100)
+#if LIBAVCODEC_VERSION_CHECK(59, 24, 100) && LIBAVUTIL_VERSION_CHECK(57, 24, 100)
     av_channel_layout_default( &ctx->ch_layout, p_dec->fmt_in.audio.i_channels );
 #else
     ctx->channels = p_dec->fmt_in.audio.i_channels;