aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/x86
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/x86
parentd222e9f9daeabe499653bc79c9a25b774941e630 (diff)
downloadffmpeg-9275438a19c02264762d550a077bbf83acd63f3f.tar.gz
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/x86')
-rw-r--r--libavutil/x86/cpu.c (renamed from libavutil/x86/cpu.h)7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavutil/x86/cpu.h b/libavutil/x86/cpu.c
index 052d2c5477..4df3286f39 100644
--- a/libavutil/x86/cpu.h
+++ b/libavutil/x86/cpu.c
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVUTIL_X86_CPU_H2
-#define AVUTIL_X86_CPU_H2
-
#include <stdlib.h>
#include "libavutil/x86_cpu.h"
#include "libavutil/cpu.h"
@@ -38,7 +35,7 @@
: "0" (index));
/* Function to test if multimedia instructions are supported... */
-int av_get_cpu_flags(void)
+int ff_get_cpu_flags_x86(void)
{
int rval = 0;
int eax, ebx, ecx, edx;
@@ -124,5 +121,3 @@ int av_get_cpu_flags(void)
return rval;
}
-
-#endif /* AVUTIL_X86_CPU_H2 */