Mercurial > mplayer.hg
changeset 27340:33274ce3cce0
Drop USE_ prefix from USE_MPLAYER_CPUDETECT #define.
It is unlike the other USE_ #defines set by configure.
| author | diego |
|---|---|
| date | Wed, 30 Jul 2008 11:48:01 +0000 |
| parents | 3d8e6afe3f9f |
| children | e7c989f7a7c9 |
| files | libmpeg2/cpu_accel.c libmpeg2/libmpeg-0.4.1.diff |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpeg2/cpu_accel.c Wed Jul 30 10:26:23 2008 +0000 +++ b/libmpeg2/cpu_accel.c Wed Jul 30 11:48:01 2008 +0000 @@ -41,11 +41,11 @@ * instructions via assembly. However, it is regarded as duplicated work * in MPlayer, so that we enforce using MPlayer's implementation. */ -#define USE_MPLAYER_CPUDETECT +#define MPLAYER_CPUDETECT static inline uint32_t arch_accel (void) { -#if !defined(USE_MPLAYER_CPUDETECT) +#if !defined(MPLAYER_CPUDETECT) uint32_t eax, ebx, ecx, edx; int AMD; uint32_t caps; @@ -120,7 +120,7 @@ caps |= MPEG2_ACCEL_X86_MMXEXT; return caps; -#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ +#else /* MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ caps = 0; if (gCpuCaps.hasMMX) caps |= MPEG2_ACCEL_X86_MMX; @@ -133,7 +133,7 @@ return caps; -#endif /* USE_MPLAYER_CPUDETECT */ +#endif /* MPLAYER_CPUDETECT */ } #endif /* ARCH_X86 || ARCH_X86_64 */
--- a/libmpeg2/libmpeg-0.4.1.diff Wed Jul 30 10:26:23 2008 +0000 +++ b/libmpeg2/libmpeg-0.4.1.diff Wed Jul 30 11:48:01 2008 +0000 @@ -19,11 +19,11 @@ + * instructions via assembly. However, it is regarded as duplicated work + * in MPlayer, so that we enforce using MPlayer's implementation. + */ -+#define USE_MPLAYER_CPUDETECT ++#define MPLAYER_CPUDETECT + static inline uint32_t arch_accel (void) { -+#if !defined(USE_MPLAYER_CPUDETECT) ++#if !defined(MPLAYER_CPUDETECT) uint32_t eax, ebx, ecx, edx; int AMD; uint32_t caps; @@ -31,7 +31,7 @@ caps |= MPEG2_ACCEL_X86_MMXEXT; return caps; -+#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ ++#else /* MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ + caps = 0; + if (gCpuCaps.hasMMX) + caps |= MPEG2_ACCEL_X86_MMX; @@ -44,7 +44,7 @@ + + return caps; + -+#endif /* USE_MPLAYER_CPUDETECT */ ++#endif /* MPLAYER_CPUDETECT */ } -#endif /* ARCH_X86 */ +#endif /* ARCH_X86 || ARCH_X86_64 */