diff cpu.h @ 1010:6138233957fe libavutil

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.
author mru
date Thu, 09 Sep 2010 18:51:45 +0000
parents 40b8596460af
children
line wrap: on
line diff
--- a/cpu.h	Wed Sep 08 15:07:14 2010 +0000
+++ b/cpu.h	Thu Sep 09 18:51:45 2010 +0000
@@ -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 */