avutil/cpu: Schedule deprecated functions for removal

av_set_cpu_flags_mask() has been deprecated in the commit which merged
it: 6df42f98746be06c883ce683563e07c9a2af983f; av_parse_cpu_flags() has
been deprecated in 4b529edff8934c258af95e5acc51f84deea66262.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 9d249737df4e09f995fcd7125b00f602c45fa64d..1215394620d0f16cb2ed3b20c214b5d619e1cef8 100644 (file)
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -102,6 +102,7 @@ int av_get_cpu_flags(void)
     return flags;
 }
 
+#if FF_API_CPU_FLAGS
 void av_set_cpu_flags_mask(int mask)
 {
     atomic_store_explicit(&cpu_flags, get_cpu_flags() & mask,
@@ -192,7 +193,7 @@ int av_parse_cpu_flags(const char *s)
 
     return flags & INT_MAX;
 }
-
+#endif
 int av_parse_cpu_caps(unsigned *flags, const char *s)
 {
         static const AVOption cpuflags_opts[] = {

diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 83099dd9697308671ee318cc955a1558d889c7e2..18dfa492ef96c6bb84bf3bd7f905437a0f03cba1 100644 (file)
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -24,6 +24,7 @@
 #include <stddef.h>
 
 #include "attributes.h"
+#include "version.h"
 
 #define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
 
@@ -88,6 +89,7 @@ int av_get_cpu_flags(void);
  */
 void av_force_cpu_flags(int flags);
 
+#if FF_API_CPU_FLAGS
 /**
  * Set a mask on flags returned by av_get_cpu_flags().
  * This function is mainly useful for testing.
@@ -106,6 +108,7 @@ attribute_deprecated void av_set_cpu_flags_mask(int mask);
  */
 attribute_deprecated
 int av_parse_cpu_flags(const char *s);
+#endif
 
 /**
  * Parse CPU caps from a string and update the given AV_CPU_* flags based on that.

diff --git a/libavutil/version.h b/libavutil/version.h
index dc8791fd0c06a6caed3dd133272f72533a1669fd..658bcd402e9b611c17afa95b5425a602ca97b8f1 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -135,6 +135,9 @@
 #ifndef FF_API_BUFFER_SIZE_T
 #define FF_API_BUFFER_SIZE_T            (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
+#ifndef FF_API_CPU_FLAGS
+#define FF_API_CPU_FLAGS                (LIBAVUTIL_VERSION_MAJOR < 57)
+#endif
 #ifndef FF_API_D2STR
 #define FF_API_D2STR                    (LIBAVUTIL_VERSION_MAJOR < 58)
 #endif