avutil/cpu: Remove deprecated functions

[ffmpeg] / libavutil / cpu.h

diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 18dfa492ef96c6bb84bf3bd7f905437a0f03cba1..b555422daeb2fe70b43b0aab427cb89843316a15 100644 (file)
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -23,9 +23,6 @@
 
 #include <stddef.h>
 
-#include "attributes.h"
-#include "version.h"
-
 #define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
 
     /* lower 16 bits - CPU features */
@@ -89,27 +86,6 @@ 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.
- * Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
- */
-attribute_deprecated void av_set_cpu_flags_mask(int mask);
-
-/**
- * Parse CPU flags from a string.
- *
- * The returned flags contain the specified flags as well as related unspecified flags.
- *
- * This function exists only for compatibility with libav.
- * Please use av_parse_cpu_caps() when possible.
- * @return a combination of AV_CPU_* flags, negative on error.
- */
-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.
  *