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

1 files changed, 2 insertions, 6 deletions

diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.c
index 45ab761406..742c3e498d 100644
--- a/libavutil/arm/cpu.h
+++ b/libavutil/arm/cpu.c
@@ -16,14 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_ARM_CPU_H
-#define AVUTIL_ARM_CPU_H
-
+#include "libavutil/cpu.h"
 #include "config.h"
 
-int av_get_cpu_flags(void)
+int ff_get_cpu_flags_arm(void)
 {
     return HAVE_IWMMXT * AV_CPU_FLAG_IWMMXT;
 }
-
-#endif /* AVUTIL_ARM_CPU_H */