From 16c6e1dee98b049c17fd262742839c0fde3ce7ed Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 1 Aug 2012 23:46:28 +0200 Subject: cpudetect: remove unused/forgotten crap --- cpudetect.c | 1 - cpudetect.h | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/cpudetect.c b/cpudetect.c index 7aa090eca5..a7a8469cbd 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -39,7 +39,6 @@ void GetCpuCaps(CpuCaps *c) memset(c, 0, sizeof(*c)); int flags = av_get_cpu_flags(); #if ARCH_X86 - c->isX86 = 1; c->hasMMX = flags & AV_CPU_FLAG_MMX; c->hasMMX2 = flags & AV_CPU_FLAG_MMX2; c->hasSSE = flags & AV_CPU_FLAG_SSE; diff --git a/cpudetect.h b/cpudetect.h index 15a3fd11ce..675dcbacde 100644 --- a/cpudetect.h +++ b/cpudetect.h @@ -22,17 +22,9 @@ #include #include "config.h" -#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 cpuStepping; - bool isX86; bool hasMMX; bool hasMMX2; bool hasSSE; @@ -43,11 +35,6 @@ typedef struct cpucaps_s { extern CpuCaps gCpuCaps; -void do_cpuid(unsigned int ax, unsigned int *p); - void GetCpuCaps(CpuCaps *caps); -/* returned value is malloc()'ed so free() it after use */ -char *GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]); - #endif /* MPLAYER_CPUDETECT_H */ -- cgit v1.2.3