summaryrefslogtreecommitdiffstats
path: root/cpudetect.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-07 22:02:47 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-07 22:03:48 +0300
commit4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1 (patch)
tree16662a6828f11f852ee4e0437ad03309d994caef /cpudetect.h
parenteee666c3b57870b7610acc846858814ce8498385 (diff)
parenta535f7bfca1bec440cec45f4201494755ed2440b (diff)
downloadmpv-4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1.tar.bz2
mpv-4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1.tar.xz
Merge svn change r31134
Fix some search/replace errors introduced in the svn commit.
Diffstat (limited to 'cpudetect.h')
-rw-r--r--cpudetect.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/cpudetect.h b/cpudetect.h
index cf39819d0b..38a7b79d11 100644
--- a/cpudetect.h
+++ b/cpudetect.h
@@ -21,30 +21,30 @@
#include "config.h"
-#define CPUTYPE_I386 3
-#define CPUTYPE_I486 4
-#define CPUTYPE_I586 5
+#define CPUTYPE_I386 3
+#define CPUTYPE_I486 4
+#define CPUTYPE_I586 5
#define CPUTYPE_I686 6
#include "ffmpeg_files/x86_cpu.h"
typedef struct cpucaps_s {
- int cpuType;
- int cpuModel;
- int cpuStepping;
- int hasMMX;
- int hasMMX2;
- int has3DNow;
- int has3DNowExt;
- int hasSSE;
- int hasSSE2;
- int hasSSE3;
- int hasSSSE3;
- int hasSSE4a;
- int isX86;
- unsigned cl_size; /* size of cache line */
- int hasAltiVec;
- int hasTSC;
+ int cpuType;
+ int cpuModel;
+ int cpuStepping;
+ int hasMMX;
+ int hasMMX2;
+ int has3DNow;
+ int has3DNowExt;
+ int hasSSE;
+ int hasSSE2;
+ int hasSSE3;
+ int hasSSSE3;
+ int hasSSE4a;
+ int isX86;
+ unsigned cl_size; /* size of cache line */
+ int hasAltiVec;
+ int hasTSC;
} CpuCaps;
extern CpuCaps gCpuCaps;