Mercurial > mplayer.hg
view cpudetect.h @ 10621:9f4af7d95d87
this small patch allows to compile the file libmpdemux/tvi_v4l.c properly,
when the Linux is patched with the V4L2 patch, which automatically
includes <linux/videodev2.h> when you include <linux/videodev.h>.
It is necessary then to prevent <linux/time.h> from including (by defining
the _LINUX_TIME_H macro) in order to resolve some collisions and it is
also necessary to prevent the defining of "struct v4l2_capability" and
"VIDIOC_QUERYCAP" in libmpdemux/tvi_v4l.c, when they are allready defined
in the <linux/videodev2.h>.
Patch by Martin Drab <drab@kepler.fjfi.cvut.cz>, checked by Arpi.
author | diego |
---|---|
date | Fri, 15 Aug 2003 15:25:55 +0000 |
parents | c428933c7e54 |
children | 685c416f12b5 |
line wrap: on
line source
#ifndef CPUDETECT_H #define CPUDETECT_H #define CPUTYPE_I386 3 #define CPUTYPE_I486 4 #define CPUTYPE_I586 5 #define CPUTYPE_I686 6 typedef struct cpucaps_s { int cpuType; int cpuStepping; int hasMMX; int hasMMX2; int has3DNow; int has3DNowExt; int hasSSE; int hasSSE2; int isX86; unsigned cl_size; /* size of cache line */ int hasAltiVec; } CpuCaps; extern CpuCaps gCpuCaps; void GetCpuCaps(CpuCaps *caps); /* returned value is malloc()'ed so free() it after use */ char *GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]); #endif /* !CPUDETECT_H */