This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 31daa7cd877c68f3503bdaae3f6e817f2e56d465 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Tue Jan 6 17:05:03 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sat Jan 10 22:47:22 2026 +0100 avcodec/pngdsp: Use proper prefix ff_add_png->ff_png_add Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/pngdec.c | 2 +- libavcodec/pngdsp.c | 4 ++-- libavcodec/pngdsp.h | 2 +- libavcodec/x86/pngdsp.asm | 2 +- libavcodec/x86/pngdsp_init.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 723f2aec4d..042b6a5c2f 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -306,7 +306,7 @@ void ff_png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type, i = w; } } - ff_add_png_paeth_prediction(dst + i, src + i, last + i, size - i, bpp); + ff_png_add_paeth_prediction(dst + i, src + i, last + i, size - i, bpp); break; } } diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index c74b4a56c3..b2f5b6018e 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -55,7 +55,7 @@ static void add_bytes_l2_c(uint8_t *dst, const uint8_t *src1, dst[i] = src1[i] + src2[i]; } -void ff_add_png_paeth_prediction(uint8_t *dst, const uint8_t *src, +void ff_png_add_paeth_prediction(uint8_t *dst, const uint8_t *src, const uint8_t *top, int w, int bpp) { for (int i = 0; i < w; ++i) { @@ -85,7 +85,7 @@ void ff_add_png_paeth_prediction(uint8_t *dst, const uint8_t *src, av_cold void ff_pngdsp_init(PNGDSPContext *dsp) { dsp->add_bytes_l2 = add_bytes_l2_c; - dsp->add_paeth_prediction = ff_add_png_paeth_prediction; + dsp->add_paeth_prediction = ff_png_add_paeth_prediction; #if ARCH_X86 && HAVE_X86ASM ff_pngdsp_init_x86(dsp); diff --git a/libavcodec/pngdsp.h b/libavcodec/pngdsp.h index f2c4b4708f..bd35431ae7 100644 --- a/libavcodec/pngdsp.h +++ b/libavcodec/pngdsp.h @@ -37,7 +37,7 @@ typedef struct PNGDSPContext { } PNGDSPContext; FF_VISIBILITY_PUSH_HIDDEN -void ff_add_png_paeth_prediction(uint8_t *dst, const uint8_t *src, +void ff_png_add_paeth_prediction(uint8_t *dst, const uint8_t *src, const uint8_t *top, int w, int bpp); void ff_pngdsp_init(PNGDSPContext *dsp); diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm index 10a1fd648b..59d4ff5d5c 100644 --- a/libavcodec/x86/pngdsp.asm +++ b/libavcodec/x86/pngdsp.asm @@ -78,7 +78,7 @@ cglobal add_bytes_l2, 4, 6, 2, dst, src1, src2, wa, w, i RET %macro ADD_PAETH_PRED_FN 1 -cglobal add_png_paeth_prediction, 5, 7, %1, dst, src, top, w, bpp, end, cntr +cglobal png_add_paeth_prediction, 5, 7, %1, dst, src, top, w, bpp, end, cntr %if ARCH_X86_64 movsxd bppq, bppd movsxd wq, wd diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c index 0af58640b8..36cd4c1d42 100644 --- a/libavcodec/x86/pngdsp_init.c +++ b/libavcodec/x86/pngdsp_init.c @@ -24,9 +24,9 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/pngdsp.h" -void ff_add_png_paeth_prediction_mmxext(uint8_t *dst, const uint8_t *src, +void ff_png_add_paeth_prediction_mmxext(uint8_t *dst, const uint8_t *src, const uint8_t *top, int w, int bpp); -void ff_add_png_paeth_prediction_ssse3(uint8_t *dst, const uint8_t *src, +void ff_png_add_paeth_prediction_ssse3(uint8_t *dst, const uint8_t *src, const uint8_t *top, int w, int bpp); void ff_add_bytes_l2_sse2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w); @@ -36,9 +36,9 @@ av_cold void ff_pngdsp_init_x86(PNGDSPContext *dsp) int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_MMXEXT(cpu_flags)) - dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmxext; + dsp->add_paeth_prediction = ff_png_add_paeth_prediction_mmxext; if (EXTERNAL_SSE2(cpu_flags)) dsp->add_bytes_l2 = ff_add_bytes_l2_sse2; if (EXTERNAL_SSSE3(cpu_flags)) - dsp->add_paeth_prediction = ff_add_png_paeth_prediction_ssse3; + dsp->add_paeth_prediction = ff_png_add_paeth_prediction_ssse3; } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
