PR #23460 opened by Niklas Haas (haasn)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23460
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23460.patch

This should be using EXTERNAL_*() as the code lives in separately assembled
files. Also, the FMA4 check should have been FMA3.

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Niklas Haas <[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 b7cb815d6d64d22cecc127a8fbb50703fe466295 Mon Sep 17 00:00:00 2001
From: Niklas Haas <[email protected]>
Date: Thu, 11 Jun 2026 20:15:38 +0200
Subject: [PATCH] swscale/x86/ops: fix CPU flags checks

This should be using EXTERNAL_*() as the code lives in separately assembled
files. Also, the FMA4 check should have been FMA3.

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Niklas Haas <[email protected]>
---
 libswscale/x86/ops.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c
index 1adb73e21c..15512db56d 100644
--- a/libswscale/x86/ops.c
+++ b/libswscale/x86/ops.c
@@ -575,11 +575,11 @@ static int compile(SwsContext *ctx, const SwsOpList *ops, 
SwsCompiledOp *out)
 {
     const int cpu_flags = av_get_cpu_flags();
     int ret, mmsize;
-    if (X86_AVX512(cpu_flags))
+    if (EXTERNAL_AVX512(cpu_flags))
         mmsize = 64;
-    else if (X86_AVX2(cpu_flags))
+    else if (EXTERNAL_AVX2(cpu_flags))
         mmsize = 32;
-    else if (X86_SSE4(cpu_flags))
+    else if (EXTERNAL_SSE4(cpu_flags))
         mmsize = 16;
     else
         return AVERROR(ENOTSUP);
@@ -600,7 +600,7 @@ static int compile(SwsContext *ctx, const SwsOpList *ops, 
SwsCompiledOp *out)
     }
 
     SwsUOpFlags flags = SWS_UOP_FLAG_MOVE;
-    if (X86_FMA4(cpu_flags))
+    if (EXTERNAL_FMA3(cpu_flags))
         flags |= SWS_UOP_FLAG_FMA;
 
     ret = ff_sws_ops_translate(ctx, ops, flags, uops);
-- 
2.52.0

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

Reply via email to