summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-19 00:29:24 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-19 00:29:24 +0200
commit71b25cca7644ab059393e9ee4682d79aab41ceba (patch)
treece2017db0a47e61b280ff41c00dccedae77fbd1d /Makefile
parenta3ab9e8e4649601281f78949e56b92755ae1142a (diff)
parentb8830753f103748e8faa630ba636c845263906ce (diff)
downloadmpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.bz2
mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.xz
Merge svn changes up to r28162
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7a5c3c4b96..4d0fa66b87 100644
--- a/Makefile
+++ b/Makefile
@@ -356,7 +356,7 @@ SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
libmpeg2/slice.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 \
+SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \
libmpeg2/motion_comp_arm_s.S
SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
libmpeg2/motion_comp_altivec.c
@@ -726,7 +726,7 @@ DIRS = . \
libass \
ffmpeg/libavcodec \
ffmpeg/libavcodec/alpha \
- ffmpeg/libavcodec/armv4l \
+ ffmpeg/libavcodec/arm \
ffmpeg/libavcodec/bfin \
ffmpeg/libavcodec/i386 \
ffmpeg/libavcodec/mlib \