This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 685011003fd9656a08492a40b375bf1c2b8f0ebb Author: Andreas Rheinhardt <[email protected]> AuthorDate: Wed Dec 24 13:32:09 2025 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sat Jan 10 22:47:22 2026 +0100 avcodec/x86/pngdsp: Remove MMXEXT function overridden by SSSE3 Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/x86/pngdsp.asm | 23 ++--------------------- libavcodec/x86/pngdsp_init.c | 4 ---- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm index 59d4ff5d5c..8ff49565d3 100644 --- a/libavcodec/x86/pngdsp.asm +++ b/libavcodec/x86/pngdsp.asm @@ -77,8 +77,8 @@ cglobal add_bytes_l2, 4, 6, 2, dst, src1, src2, wa, w, i jl .loop_s RET -%macro ADD_PAETH_PRED_FN 1 -cglobal png_add_paeth_prediction, 5, 7, %1, dst, src, top, w, bpp, end, cntr +INIT_MMX ssse3 +cglobal png_add_paeth_prediction, 5, 7, 0, dst, src, top, w, bpp, end, cntr %if ARCH_X86_64 movsxd bppq, bppd movsxd wq, wd @@ -109,21 +109,9 @@ cglobal png_add_paeth_prediction, 5, 7, %1, dst, src, top, w, bpp, end, cntr psubw m4, m0 mova m5, m3 paddw m5, m4 -%if cpuflag(ssse3) pabsw m3, m3 pabsw m4, m4 pabsw m5, m5 -%else ; !cpuflag(ssse3) - psubw m7, m5 - pmaxsw m5, m7 - pxor m6, m6 - pxor m7, m7 - psubw m6, m3 - psubw m7, m4 - pmaxsw m3, m6 - pmaxsw m4, m7 - pxor m7, m7 -%endif ; cpuflag(ssse3) mova m6, m4 pminsw m6, m5 pcmpgtw m3, m6 @@ -153,10 +141,3 @@ cglobal png_add_paeth_prediction, 5, 7, %1, dst, src, top, w, bpp, end, cntr POP dstq emms RET -%endmacro - -INIT_MMX mmxext -ADD_PAETH_PRED_FN 0 - -INIT_MMX ssse3 -ADD_PAETH_PRED_FN 0 diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c index 36cd4c1d42..5121140dcc 100644 --- a/libavcodec/x86/pngdsp_init.c +++ b/libavcodec/x86/pngdsp_init.c @@ -24,8 +24,6 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/pngdsp.h" -void ff_png_add_paeth_prediction_mmxext(uint8_t *dst, const uint8_t *src, - const uint8_t *top, int w, int bpp); 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, @@ -35,8 +33,6 @@ 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_png_add_paeth_prediction_mmxext; if (EXTERNAL_SSE2(cpu_flags)) dsp->add_bytes_l2 = ff_add_bytes_l2_sse2; if (EXTERNAL_SSSE3(cpu_flags)) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
