summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-10-02 05:17:23 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-10-02 05:17:23 +0300
commitebb4abf2081026c63bb5c983f76447d9d2413656 (patch)
treef2b3ed868645fd2546173be3500f4c3e0cdf3ecc /Makefile
parent849dc0ba31f209dfdb48146512e48ee2203d0ee6 (diff)
parent20571d6f6870dab84624cc6b6fbac82cde204f16 (diff)
downloadmpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.bz2
mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.xz
Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9c889533af..4a0d521c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -357,8 +357,7 @@ SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \
libmpeg2/motion_comp_alpha.c
SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARMV4L) += libmpeg2/motion_comp_arm.c \
- libmpeg2/motion_comp_arm_s.S \
- libmpeg2/motion_comp_iwmmxt.c
+ libmpeg2/motion_comp_arm_s.S
SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
libmpeg2/motion_comp_altivec.c
SRCS_COMMON-$(LIBMPEG2)-$(HAVE_MMX) += libmpeg2/idct_mmx.c \