diff options
author | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-07 23:26:40 +0000 |
---|---|---|
committer | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-07 23:26:40 +0000 |
commit | 99ef6b44d297be3613141a4ccf69220ea9dc7a3c (patch) | |
tree | 47e0d91a9b02650e060dc1ce9fe9311a8ecea94a /libmpeg2 | |
parent | f65ac3ac9293def71afd74da834e3b24da7623e0 (diff) | |
download | mpv-99ef6b44d297be3613141a4ccf69220ea9dc7a3c.tar.bz2 mpv-99ef6b44d297be3613141a4ccf69220ea9dc7a3c.tar.xz |
add MPlayer's local changes introduced in r23258
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23259 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
-rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index c834e3dbb3..47f323f6ce 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -321,9 +321,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 @@ -1075,6 +1075,6 @@ Index: libmpeg2/Makefile 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 |