From f65ac3ac9293def71afd74da834e3b24da7623e0 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Mon, 7 May 2007 22:22:27 +0000 Subject: [PATCH] compile fix for regression introduced by r23254 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23258 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpeg2/Makefile | 2 +- libmpeg2/motion_comp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile index 77c40a9e47..240272842b 100644 --- a/libmpeg2/Makefile +++ b/libmpeg2/Makefile @@ -15,6 +15,6 @@ SRCS_COMMON-$(TARGET_MMX) += idct_mmx.c motion_comp_mmx.c 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 diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c index 3307c0af8d..38b54b8f5d 100644 --- a/libmpeg2/motion_comp.c +++ b/libmpeg2/motion_comp.c @@ -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