diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-19 00:29:24 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-19 00:29:24 +0200 |
commit | 71b25cca7644ab059393e9ee4682d79aab41ceba (patch) | |
tree | ce2017db0a47e61b280ff41c00dccedae77fbd1d /Makefile | |
parent | a3ab9e8e4649601281f78949e56b92755ae1142a (diff) | |
parent | b8830753f103748e8faa630ba636c845263906ce (diff) | |
download | mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.bz2 mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.xz |
Merge svn changes up to r28162
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 \ |