summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-11-23 01:56:21 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-11-23 01:56:21 +0200
commit5995bc175aea0417ce7ff7285c1c8fc84ebb5704 (patch)
tree7fa0b90e03fc5b3a6447b79754b654bc279f5237 /Makefile
parent4c552b2e420ba4cb6d888b12360c7bf63e7cd03a (diff)
parentaf2988cbcef1b057772d44b9f9752be3f15960b0 (diff)
downloadmpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.bz2
mpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.xz
Merge svn changes up to r29962
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7ce6ca1d09..005a721b48 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,9 @@ SRCS_COMMON-$(LIBAVCODEC_INTERNALS) += libaf/af_lavcac3enc.c \
libmpcodecs/vf_qp.c \
libmpcodecs/vf_spp.c \
-SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c
+SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c \
+ stream/stream_ffmpeg.c \
+
SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c
SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \