[FFmpeg-devel] [PATCH] configure: Add missing dependencies for AHX decoder (PR #20581)

[mkver via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #20581 opened by mkver
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20581
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20581.patch


>From 1fc2742ae595ae175eafca502b976bd8bfd19876 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Tue, 23 Sep 2025 05:40:39 +0200
Subject: [PATCH 1/2] configure: Add missing dependencies for AHX decoder

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index a7bb518d70..e5764a17a3 100755
--- a/configure
+++ b/configure
@@ -2979,6 +2979,7 @@ adpcm_n64_decoder_deps="lgpl_gpl"
 adpcm_psxc_decoder_deps="lgpl_gpl"
 agm_decoder_select="idctdsp"
 ahx_decoder_deps="lgpl_gpl"
+ahx_decoder_select="mpegaudio ahx_to_mp2_bsf"
 aic_decoder_select="golomb idctdsp"
 alac_encoder_select="lpc"
 als_decoder_select="bswapdsp mpeg4audio"
-- 
2.49.1


>From 100f869f245e0d675a106a7affbd0ecdef3c70b4 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Tue, 23 Sep 2025 05:42:59 +0200
Subject: [PATCH 2/2] avcodec/mpegaudiodec_float: Don't set AVCodec.sample_fmts
 directly

It is deprecated and doing so gives warnings from Clang.
Use CODEC_SAMPLEFMTS instead.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/mpegaudiodec_float.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c
index 232e2fa201..e713e9e251 100644
--- a/libavcodec/mpegaudiodec_float.c
+++ b/libavcodec/mpegaudiodec_float.c
@@ -115,9 +115,7 @@ const FFCodec ff_ahx_decoder = {
     .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF |
                       AV_CODEC_CAP_DR1,
     .flush          = flush,
-    .p.sample_fmts  = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
-                                                      AV_SAMPLE_FMT_FLT,
-                                                      AV_SAMPLE_FMT_NONE },
+    CODEC_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT),
     .bsfs           = "ahx_to_mp2",
 };
 #endif
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org