[FFmpeg-devel] [PATCH] swscale/ops: Fix linking with x86 assembly disabled (PR #20432)

[mkver via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

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

Also use "" instead of <> to include our own headers.


>From fec72a6ead263021148530ec6a97de0c0e56cb0f Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Thu, 4 Sep 2025 14:01:20 +0200
Subject: [PATCH 1/2] swscale/ops: Fix linking with x86 assembly disabled

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libswscale/ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/ops.c b/libswscale/ops.c
index e8c05587e1..21aeb16931 100644
--- a/libswscale/ops.c
+++ b/libswscale/ops.c
@@ -33,7 +33,7 @@ extern const SwsOpBackend backend_x86;
 
 const SwsOpBackend * const ff_sws_op_backends[] = {
     &backend_murder,
-#if ARCH_X86_64
+#if ARCH_X86_64 && HAVE_X86ASM
     &backend_x86,
 #endif
     &backend_c,
-- 
2.49.1


>From c6dc5d299e1b4f2730691910b1b9cfaa0092166b Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Thu, 4 Sep 2025 14:16:45 +0200
Subject: [PATCH 2/2] all: Use "" instead of <> to include internal headers

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 fftools/textformat/tf_mermaid.c | 7 +++----
 libavfilter/vf_colordetect.h    | 5 ++---
 libavfilter/vf_deshake_opencl.c | 2 +-
 libswscale/ops_optimizer.c      | 2 +-
 libswscale/x86/ops.c            | 4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/fftools/textformat/tf_mermaid.c b/fftools/textformat/tf_mermaid.c
index 6af58d58c2..ef730d570b 100644
--- a/fftools/textformat/tf_mermaid.c
+++ b/fftools/textformat/tf_mermaid.c
@@ -27,10 +27,9 @@
 #include "avtextformat.h"
 #include "tf_internal.h"
 #include "tf_mermaid.h"
-#include <libavutil/mem.h>
-#include <libavutil/avassert.h>
-#include <libavutil/bprint.h>
-#include <libavutil/opt.h>
+#include "libavutil/bprint.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
 
 
 static const char *init_directive = ""
diff --git a/libavfilter/vf_colordetect.h b/libavfilter/vf_colordetect.h
index 95f30a6ac2..aa974bb1fd 100644
--- a/libavfilter/vf_colordetect.h
+++ b/libavfilter/vf_colordetect.h
@@ -22,9 +22,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <libavutil/avassert.h>
-#include <libavutil/macros.h>
-#include <libavutil/pixfmt.h>
+#include "libavutil/avassert.h"
+#include "libavutil/pixfmt.h"
 
 enum FFAlphaDetect {
     FF_ALPHA_NONE         = -1,
diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c
index dc3df0e989..1dc5486613 100644
--- a/libavfilter/vf_deshake_opencl.c
+++ b/libavfilter/vf_deshake_opencl.c
@@ -46,7 +46,7 @@
  */
 
 #include <float.h>
-#include <libavutil/lfg.h>
+#include "libavutil/lfg.h"
 #include "libavutil/opt.h"
 #include "libavutil/mem.h"
 #include "libavutil/fifo.h"
diff --git a/libswscale/ops_optimizer.c b/libswscale/ops_optimizer.c
index c28c2c36bb..b13e7ebdc1 100644
--- a/libswscale/ops_optimizer.c
+++ b/libswscale/ops_optimizer.c
@@ -19,7 +19,7 @@
  */
 
 #include "libavutil/avassert.h"
-#include <libavutil/bswap.h>
+#include "libavutil/bswap.h"
 #include "libavutil/rational.h"
 
 #include "ops.h"
diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c
index 8704f77227..3b5a060f64 100644
--- a/libswscale/x86/ops.c
+++ b/libswscale/x86/ops.c
@@ -20,8 +20,8 @@
 
 #include <float.h>
 
-#include <libavutil/avassert.h>
-#include <libavutil/mem.h>
+#include "libavutil/avassert.h"
+#include "libavutil/mem.h"
 
 #include "../ops_chain.h"
 
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org