The branch, master has been updated
via 2451e06f19fe148456e4994b6f1259683cb04ef3 (commit)
via 7dc4c4f6f5c80274ca719393e70f7e43b67d2c27 (commit)
from 6696a9b8bd2eacf90d7bd199d37115ba12def793 (commit)
- Log -----------------------------------------------------------------
commit 2451e06f19fe148456e4994b6f1259683cb04ef3
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Thu Sep 4 14:16:45 2025 +0200
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Thu Sep 4 22:20:58 2025 +0200
all: Use "" instead of <> to include internal headers
Reviewed-by: Niklas Haas <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
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"
commit 7dc4c4f6f5c80274ca719393e70f7e43b67d2c27
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Thu Sep 4 14:01:20 2025 +0200
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Thu Sep 4 22:14:39 2025 +0200
swscale/ops: Fix linking with x86 assembly disabled
Reviewed-by: Niklas Haas <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
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,
-----------------------------------------------------------------------
Summary of changes:
fftools/textformat/tf_mermaid.c | 7 +++----
libavfilter/vf_colordetect.h | 5 ++---
libavfilter/vf_deshake_opencl.c | 2 +-
libswscale/ops.c | 2 +-
libswscale/ops_optimizer.c | 2 +-
libswscale/x86/ops.c | 4 ++--
6 files changed, 10 insertions(+), 12 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
