summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-02 23:53:54 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-02 23:55:13 +0300
commitd136cf68827382ad710adb74d02e50364052f430 (patch)
treedf40e0284c9275bb185bc098cc3ed039bb765692 /Makefile
parentcf9edda1d370d39bc8a3d020a9c2bc4090d2457e (diff)
parent83c2df3565c19931b01c3ed75a0e08aca1fb24f2 (diff)
downloadmpv-d136cf68827382ad710adb74d02e50364052f430.tar.bz2
mpv-d136cf68827382ad710adb74d02e50364052f430.tar.xz
Merge svn changes up to r29134
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 914df402f8..34240369dd 100644
--- a/Makefile
+++ b/Makefile
@@ -343,6 +343,7 @@ SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \
libmpcodecs/vf_uspp.c \
SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c
+SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c
SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
@@ -748,6 +749,12 @@ DIRS = . \
ffmpeg/libavcodec/sparc \
ffmpeg/libavformat \
ffmpeg/libavutil \
+ ffmpeg/libavutil/arm \
+ ffmpeg/libavutil/bfin \
+ ffmpeg/libavutil/bfin \
+ ffmpeg/libavutil/ppc \
+ ffmpeg/libavutil/sh4 \
+ ffmpeg/libavutil/x86 \
libdvdcss \
libdvdnav \
libdvdnav/vm \
@@ -760,6 +767,11 @@ DIRS = . \
libmpeg2 \
ffmpeg/libpostproc \
libswscale \
+ libswscale/bfin \
+ libswscale/mlib \
+ libswscale/ppc \
+ libswscale/sparc \
+ libswscale/x86 \
libvo \
loader \
loader/dshow \