PR #25204 opened by Jun Zhao (mypopydev)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25204
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25204.patch

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 <[email protected]>

# Summary of changes

Briefly describe what this PR does and why.

<!--
If this PR requires new FATE test samples, attach them to the PR and
list their target paths below (relative to the fate-suite root).

Attached filenames must match the sample's filename:

```fate-samples
# e.g. vorbis/new-sample.ogg
```
-->



>From c62155ea51751367f9da3475663b7a47c0ea2c48 Mon Sep 17 00:00:00 2001
From: Jun Zhao <[email protected]>
Date: Mon, 19 Oct 2026 09:16:20 +0800
Subject: [PATCH] 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 <[email protected]>
---
 libavcodec/aarch64/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

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
-- 
2.54.0

_______________________________________________
ffmpeg-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to