Mercurial > mplayer.hg

changeset 23240:316732ab2b41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compile fix for regression introduced by r23254
author gpoirier
date Mon, 07 May 2007 22:22:27 +0000
parents cc01eab9f3a9
children e42491f6fa84
files libmpeg2/Makefile libmpeg2/motion_comp.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpeg2/Makefile	Mon May 07 21:58:42 2007 +0000
+++ b/libmpeg2/Makefile	Mon May 07 22:22:27 2007 +0000
@@ -15,6 +15,6 @@
 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
--- a/libmpeg2/motion_comp.c	Mon May 07 21:58:42 2007 +0000
+++ b/libmpeg2/motion_comp.c	Mon May 07 22:22:27 2007 +0000
@@ -68,9 +68,9 @@
     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