diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-09-09 18:51:45 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-09-09 18:51:45 +0000 |
| commit | 9275438a19c02264762d550a077bbf83acd63f3f (patch) | |
| tree | 6fe28bcf94fa6d97578579f251a0f8e9a193be97 /libavutil/cpu.c | |
| parent | d222e9f9daeabe499653bc79c9a25b774941e630 (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.c')
| -rw-r--r-- | libavutil/cpu.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index fb37edb879..34530eebaf 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -19,18 +19,13 @@ #include "cpu.h" #include "config.h" -#if ARCH_ARM -# include "arm/cpu.h" -#elif ARCH_PPC -# include "ppc/cpu.h" -#elif ARCH_X86 -# include "x86/cpu.h" -#else int av_get_cpu_flags(void) { + if (ARCH_ARM) return ff_get_cpu_flags_arm(); + if (ARCH_PPC) return ff_get_cpu_flags_ppc(); + if (ARCH_X86) return ff_get_cpu_flags_x86(); return 0; } -#endif #ifdef TEST |