summaryrefslogtreecommitdiffstats
path: root/cpudetect.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-01 02:26:34 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-01 02:43:47 +0300
commitcf9edda1d370d39bc8a3d020a9c2bc4090d2457e (patch)
tree1d1bbc529a4e8109fb6aa5cadf0dbbb7bd61013a /cpudetect.h
parent7af8417ae7beb409f54849956a7037bc66c4c334 (diff)
parent1c37a6427abef0827c608d328d37ca1b1a0a022d (diff)
downloadmpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.bz2
mpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.xz
Merge svn changes up to r29117
Diffstat (limited to 'cpudetect.h')
-rw-r--r--cpudetect.h28
1 files changed, 1 insertions, 27 deletions
diff --git a/cpudetect.h b/cpudetect.h
index f31bf07dff..5ac4633582 100644
--- a/cpudetect.h
+++ b/cpudetect.h
@@ -8,33 +8,7 @@
#define CPUTYPE_I586 5
#define CPUTYPE_I686 6
-#if ARCH_X86_64
-# define REGa rax
-# define REGb rbx
-# define REGBP rbp
-# define REGSP rsp
-# define REG_a "rax"
-# define REG_b "rbx"
-# define REG_c "rcx"
-# define REG_d "rdx"
-# define REG_S "rsi"
-# define REG_D "rdi"
-# define REG_SP "rsp"
-# define REG_BP "rbp"
-#else
-# define REGa eax
-# define REGb ebx
-# define REGBP ebp
-# define REGSP esp
-# define REG_a "eax"
-# define REG_b "ebx"
-# define REG_c "ecx"
-# define REG_d "edx"
-# define REG_S "esi"
-# define REG_D "edi"
-# define REG_SP "esp"
-# define REG_BP "ebp"
-#endif
+#include "libavutil/x86_cpu.h"
typedef struct cpucaps_s {
int cpuType;