[MPlayer-cvslog] r27372 - in trunk/libmpeg2: cpu_accel.c libmpeg-0.4.1.diff

[diego]

Author: diego
Date: Wed Jul 30 13:48:01 2008
New Revision: 27372

Log:
Drop USE_ prefix from USE_MPLAYER_CPUDETECT #define.
It is unlike the other USE_ #defines set by configure.


Modified:
   trunk/libmpeg2/cpu_accel.c
   trunk/libmpeg2/libmpeg-0.4.1.diff

Modified: trunk/libmpeg2/cpu_accel.c
==============================================================================
--- trunk/libmpeg2/cpu_accel.c	(original)
+++ trunk/libmpeg2/cpu_accel.c	Wed Jul 30 13:48:01 2008
@@ -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 @@ static inline uint32_t arch_accel (void)
 	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 @@ static inline uint32_t arch_accel (void)
 
     return caps;
 
-#endif /* USE_MPLAYER_CPUDETECT */
+#endif /* MPLAYER_CPUDETECT */
 }
 #endif /* ARCH_X86 || ARCH_X86_64 */
 

Modified: trunk/libmpeg2/libmpeg-0.4.1.diff
==============================================================================
--- trunk/libmpeg2/libmpeg-0.4.1.diff	(original)
+++ trunk/libmpeg2/libmpeg-0.4.1.diff	Wed Jul 30 13:48:01 2008
@@ -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 */