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


>From 4baaab592d1853e6b8d97d5d8ffd500864a79898 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <[email protected]>
Date: Sun, 14 Jun 2026 22:40:05 +0200
Subject: [PATCH 1/3] avcodec/x86/hpeldsp: Remove declaration of non-existing
 func

Forgotten in a51279bbdea0d6db920d71980262bccd0ce78226.

Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavcodec/x86/hpeldsp.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/x86/hpeldsp.h b/libavcodec/x86/hpeldsp.h
index 8208e43ac1..8bc1b3fd68 100644
--- a/libavcodec/x86/hpeldsp.h
+++ b/libavcodec/x86/hpeldsp.h
@@ -22,9 +22,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels,
-                           ptrdiff_t line_size, int h);
-
 void ff_avg_pixels8_xy2_ssse3(uint8_t *block, const uint8_t *pixels,
                                ptrdiff_t line_size, int h);
 
-- 
2.52.0


>From 9a97722fc4885d5667b415d31dbb5a70b9e18b36 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <[email protected]>
Date: Sun, 14 Jun 2026 22:54:02 +0200
Subject: [PATCH 2/3] avcodec/x86/rv40dsp_init: Remove pointless av_unused

Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavcodec/x86/rv40dsp_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c
index 97abee3219..99886a2289 100644
--- a/libavcodec/x86/rv40dsp_init.c
+++ b/libavcodec/x86/rv40dsp_init.c
@@ -175,7 +175,7 @@ void ff_rv40_ ## OP ## _chroma_mc ## SIZE ## _ ## 
XMM(uint8_t *dst, const uint8_
 
 av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c)
 {
-    av_unused int cpu_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
     if (EXTERNAL_SSE2(cpu_flags)) {
         c->put_pixels_tab[0][15]        = put_rv40_qpel16_mc33_sse2;
-- 
2.52.0


>From 5a68e2b1c5e7541ffc152ec44c57ba7dab4300cc Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <[email protected]>
Date: Sun, 14 Jun 2026 22:54:21 +0200
Subject: [PATCH 3/3] avcodec/x86/cavsdsp: Combine #if blocks, avoid av_unused

Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavcodec/x86/cavsdsp.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c
index 91ec866681..a26fc9661c 100644
--- a/libavcodec/x86/cavsdsp.c
+++ b/libavcodec/x86/cavsdsp.c
@@ -44,9 +44,6 @@ static void cavs_idct8_add_sse2(uint8_t *dst, int16_t *block, 
ptrdiff_t stride)
     ff_add_pixels_clamped_sse2(b2, dst, stride);
 }
 
-#endif /* HAVE_SSE2_EXTERNAL */
-
-#if HAVE_SSE2_EXTERNAL
 #define DEF_QPEL(OPNAME) \
     void ff_ ## OPNAME ## _cavs_qpel8_mc20_sse2(uint8_t *dst, const uint8_t 
*src, ptrdiff_t stride);     \
     void ff_ ## OPNAME ## _cavs_qpel8_mc02_sse2(uint8_t *dst, const uint8_t 
*src, ptrdiff_t stride);     \
@@ -89,9 +86,9 @@ QPEL_CAVS_XMM(avg, sse2)
 
 av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c)
 {
-    av_unused int cpu_flags = av_get_cpu_flags();
-
 #if HAVE_SSE2_EXTERNAL
+    int cpu_flags = av_get_cpu_flags();
+
     if (EXTERNAL_SSE2(cpu_flags)) {
         c->put_cavs_qpel_pixels_tab[0][ 0] = ff_put_pixels16x16_sse2;
         c->put_cavs_qpel_pixels_tab[0][ 2] = put_cavs_qpel16_mc20_sse2;
-- 
2.52.0

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

Reply via email to