add MPlayer's local changes introduced in r23258

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23259 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
gpoirier 2007-05-07 23:26:40 +00:00
parent f65ac3ac92
commit 99ef6b44d2
1 changed files with 3 additions and 3 deletions

View File

@ -321,9 +321,9 @@
else else
#endif #endif
+#ifdef ARCH_ARM +#ifdef ARCH_ARM
+ if (accel & MPEG2_ACCEL_ARM) { + if (1 /*accel & MPEG2_ACCEL_ARM*/) {
+#ifdef HAVE_IWMMXT +#ifdef HAVE_IWMMXT
+ if (accel & MPEG2_ACCEL_ARM_IWMMXT) + if (1 /*accel & MPEG2_ACCEL_ARM_IWMMXT*/)
+ mpeg2_mc = mpeg2_mc_iwmmxt; + mpeg2_mc = mpeg2_mc_iwmmxt;
+ else + else
+#endif +#endif
@ -1075,6 +1075,6 @@ Index: libmpeg2/Makefile
SRCS_COMMON-$(TARGET_ALTIVEC) += motion_comp_altivec.c idct_altivec.c SRCS_COMMON-$(TARGET_ALTIVEC) += motion_comp_altivec.c idct_altivec.c
SRCS_COMMON-$(TARGET_VIS) += motion_comp_vis.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_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 include ../mpcommon.mak