[MPlayer-cvslog] r23258 - in trunk/libmpeg2: Makefile motion_comp.c

[gpoirier]

Author: gpoirier
Date: Tue May  8 00:22:27 2007
New Revision: 23258

Log:
compile fix for regression introduced by r23254


Modified:
   trunk/libmpeg2/Makefile
   trunk/libmpeg2/motion_comp.c

Modified: trunk/libmpeg2/Makefile
==============================================================================
--- trunk/libmpeg2/Makefile	(original)
+++ trunk/libmpeg2/Makefile	Tue May  8 00:22:27 2007
@@ -15,6 +15,6 @@ SRCS_COMMON-$(TARGET_MMX)        += idct
 SRCS_COMMON-$(TARGET_ALTIVEC)    += motion_comp_altivec.c idct_altivec.c
 SRCS_COMMON-$(TARGET_VIS)        += motion_comp_vis.c
 SRCS_COMMON-$(TARGET_ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c
-SRCS_COMMON-$(TARGET_ARCH_ARMV4l) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
+SRCS_COMMON-$(TARGET_ARCH_ARMV4L) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
 
 include ../mpcommon.mak

Modified: trunk/libmpeg2/motion_comp.c
==============================================================================
--- trunk/libmpeg2/motion_comp.c	(original)
+++ trunk/libmpeg2/motion_comp.c	Tue May  8 00:22:27 2007
@@ -68,9 +68,9 @@ void mpeg2_mc_init (uint32_t accel)
     else
 #endif
 #ifdef ARCH_ARM
-    if (accel & MPEG2_ACCEL_ARM) {
+    if (1 /*accel & MPEG2_ACCEL_ARM*/) {
 #ifdef HAVE_IWMMXT
-	if (accel & MPEG2_ACCEL_ARM_IWMMXT)
+	if (1 /*accel & MPEG2_ACCEL_ARM_IWMMXT*/)
 	    mpeg2_mc = mpeg2_mc_iwmmxt;
 	else
 #endif