[FFmpeg-devel] [PATCH] avutil/cpu: Deprecate AV_CPU_FLAG_FORCE (PR #20911)

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

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

This flag does nothing since the deactivation of
the dsp_mask field of AVCodecContext in
commits 9ae6ba288368be42dbd77613e07255d38bbba40e and
9ae6ba288368be42dbd77613e07255d38bbba40e (it has
been superseded with better ways to override the CPU flags).
So deprecate it.

(Missing version bump in this patch.)


>From 7b3aab3ba620eb7a470509b3dc7ccf61c813cd79 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Thu, 13 Nov 2025 14:16:30 +0100
Subject: [PATCH] avutil/cpu: Deprecate AV_CPU_FLAG_FORCE

This flag does nothing since the deactivation of
the dsp_mask field of AVCodecContext in
commits 9ae6ba288368be42dbd77613e07255d38bbba40e and
9ae6ba288368be42dbd77613e07255d38bbba40e (it has
been superseded with better ways to override the CPU flags).
So deprecate it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 doc/APIchanges      | 3 +++
 libavutil/cpu.h     | 4 +++-
 libavutil/version.h | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 9d128ae77b..fafda4d063 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2025-03-28
 
 API changes, most recent first:
 
+2025-11-13 - xxxxxxxxxx - lavu 60.yy.100 - cpu.h
+  Deprecate AV_CPU_FLAG_FORCE without replacement.
+
 2025-11-01 - xxxxxxxxxx - lavc 62.19.100 - avcodec.h
   Schedule AVCodecParser and av_parser_init() to use enum AVCodecID
   for codec ids on the next major version bump.
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 5ef5da58eb..a06fc08e56 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -24,7 +24,9 @@
 #include <stddef.h>
 #include "version.h"
 
-#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
+#if FF_API_CPU_FLAG_FORCE
+#define AV_CPU_FLAG_FORCE    0x80000000 /* @deprecated, should not be used */
+#endif
 
     /* lower 16 bits - CPU features */
 #define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
diff --git a/libavutil/version.h b/libavutil/version.h
index b16b88bfca..4879f1e0c4 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -110,6 +110,7 @@
 #define FF_API_VULKAN_FIXED_QUEUES      (LIBAVUTIL_VERSION_MAJOR < 61)
 #define FF_API_OPT_INT_LIST             (LIBAVUTIL_VERSION_MAJOR < 61)
 #define FF_API_OPT_PTR                  (LIBAVUTIL_VERSION_MAJOR < 61)
+#define FF_API_CPU_FLAG_FORCE           (LIBAVUTIL_VERSION_MAJOR < 61)
 
 /**
  * @}
-- 
2.49.1

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