Commit 2344518cc5 for ffmpeg
commit 2344518cc56d66cecc6d6d3d8f613baaed58faf4
Author: Jun Zhao <barryjzhao@tencent.com>
Date: Mon Oct 19 09:16:20 2026 +0800
avcodec/aarch64: build pngdsp for the APNG and LSCR decoders
pngdsp.c calls ff_pngdsp_init_aarch64 on this architecture, and both
decoders link pngdsp.o. The init and NEON objects were selected only
for the PNG decoder, so a build with APNG or LSCR and without PNG
failed to link.
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile
index b1ceb36668..0fe117748f 100644
--- a/libavcodec/aarch64/Makefile
+++ b/libavcodec/aarch64/Makefile
@@ -13,6 +13,8 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_init.o
OBJS-$(CONFIG_MPEGVIDEOENCDSP) += aarch64/mpegvideoencdsp_init.o
OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o
OBJS-$(CONFIG_PIXBLOCKDSP) += aarch64/pixblockdsp_init_aarch64.o
+OBJS-$(CONFIG_APNG_DECODER) += aarch64/pngdsp_init.o
+OBJS-$(CONFIG_LSCR_DECODER) += aarch64/pngdsp_init.o
OBJS-$(CONFIG_PNG_DECODER) += aarch64/pngdsp_init.o
OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o
OBJS-$(CONFIG_VP8DSP) += aarch64/vp8dsp_init_aarch64.o
@@ -59,6 +61,8 @@ NEON-OBJS-$(CONFIG_ME_CMP) += aarch64/me_cmp_neon.o
NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o
NEON-OBJS-$(CONFIG_MPEGVIDEOENCDSP) += aarch64/mpegvideoencdsp_neon.o
NEON-OBJS-$(CONFIG_PIXBLOCKDSP) += aarch64/pixblockdsp_neon.o
+NEON-OBJS-$(CONFIG_APNG_DECODER) += aarch64/pngdsp_neon.o
+NEON-OBJS-$(CONFIG_LSCR_DECODER) += aarch64/pngdsp_neon.o
NEON-OBJS-$(CONFIG_PNG_DECODER) += aarch64/pngdsp_neon.o
NEON-OBJS-$(CONFIG_VC1DSP) += aarch64/vc1dsp_neon.o
NEON-OBJS-$(CONFIG_VP8DSP) += aarch64/vp8dsp_neon.o