RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Drop USE_ prefix from USE_MPLAYER_CPUDETECT #define. 

It is unlike the other USE_ #defines set by configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27372 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-07-30 11:48:01 +00:00
parent 771cd67118
commit cbe1fcbf83
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmpeg2/cpu_accel.c
View File

@ -41,11 +41,11 @@
* instructions via assembly. However, it is regarded as duplicated work * instructions via assembly. However, it is regarded as duplicated work
* in MPlayer, so that we enforce using MPlayer's implementation. * in MPlayer, so that we enforce using MPlayer's implementation.
*/ */
#define USE_MPLAYER_CPUDETECT #define MPLAYER_CPUDETECT
static inline uint32_t arch_accel (void) static inline uint32_t arch_accel (void)
{ {
#if !defined(USE_MPLAYER_CPUDETECT) #if !defined(MPLAYER_CPUDETECT)
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
int AMD; int AMD;
uint32_t caps; uint32_t caps;
@ -120,7 +120,7 @@ static inline uint32_t arch_accel (void)
caps |= MPEG2_ACCEL_X86_MMXEXT; caps |= MPEG2_ACCEL_X86_MMXEXT;
return caps; return caps;
#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ #else /* MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */
caps = 0; caps = 0;
if (gCpuCaps.hasMMX) if (gCpuCaps.hasMMX)
caps |= MPEG2_ACCEL_X86_MMX; caps |= MPEG2_ACCEL_X86_MMX;
@ -133,7 +133,7 @@ static inline uint32_t arch_accel (void)
return caps; return caps;
#endif /* USE_MPLAYER_CPUDETECT */ #endif /* MPLAYER_CPUDETECT */
} }
#endif /* ARCH_X86 || ARCH_X86_64 */ #endif /* ARCH_X86 || ARCH_X86_64 */

8
libmpeg2/libmpeg-0.4.1.diff
View File

@ -19,11 +19,11 @@
+ * instructions via assembly. However, it is regarded as duplicated work + * instructions via assembly. However, it is regarded as duplicated work
+ * in MPlayer, so that we enforce using MPlayer's implementation. + * in MPlayer, so that we enforce using MPlayer's implementation.
+ */ + */
+#define USE_MPLAYER_CPUDETECT +#define MPLAYER_CPUDETECT
+ +
static inline uint32_t arch_accel (void) static inline uint32_t arch_accel (void)
{ {
+#if !defined(USE_MPLAYER_CPUDETECT) +#if !defined(MPLAYER_CPUDETECT)
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
int AMD; int AMD;
uint32_t caps; uint32_t caps;
@ -31,7 +31,7 @@
caps |= MPEG2_ACCEL_X86_MMXEXT; caps |= MPEG2_ACCEL_X86_MMXEXT;
return caps; return caps;
+#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ +#else /* MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */
+ caps = 0; + caps = 0;
+ if (gCpuCaps.hasMMX) + if (gCpuCaps.hasMMX)
+ caps |= MPEG2_ACCEL_X86_MMX; + caps |= MPEG2_ACCEL_X86_MMX;
@ -44,7 +44,7 @@
+ +
+ return caps; + return caps;
+ +
+#endif /* USE_MPLAYER_CPUDETECT */ +#endif /* MPLAYER_CPUDETECT */
} }
-#endif /* ARCH_X86 */ -#endif /* ARCH_X86 */
+#endif /* ARCH_X86 || ARCH_X86_64 */ +#endif /* ARCH_X86 || ARCH_X86_64 */