summaryrefslogtreecommitdiff
path: root/libavutil/cpu.h
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-09-09 18:51:45 +0000
committerMåns Rullgård <mans@mansr.com>2010-09-09 18:51:45 +0000
commit9275438a19c02264762d550a077bbf83acd63f3f (patch)
tree6fe28bcf94fa6d97578579f251a0f8e9a193be97 /libavutil/cpu.h
parentd222e9f9daeabe499653bc79c9a25b774941e630 (diff)
Clean up av_get_cpu_flag()
Instead of defining functions in per-arch header files included by the main cpu.c, define them normally and call them from the generic one. Originally committed as revision 25084 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/cpu.h')
-rw-r--r--libavutil/cpu.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 08e82f1d04..71cc26529a 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -21,8 +21,6 @@
#ifndef AVUTIL_CPU_H
#define AVUTIL_CPU_H
-#include "avutil.h"
-
#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
/* lower 16 bits - CPU features */
@@ -46,4 +44,9 @@
*/
int av_get_cpu_flags(void);
+/* The following CPU-specific functions shall not be called directly. */
+int ff_get_cpu_flags_arm(void);
+int ff_get_cpu_flags_ppc(void);
+int ff_get_cpu_flags_x86(void);
+
#endif /* AVUTIL_CPU_H */