summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 03:18:42 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 03:18:42 +0200
commit0269d22d32fb380e7128ca0c60f6f1638c6dab70 (patch)
tree53ba64153d9ef930f73458138478a6d0def381ce /Makefile
parent240550bbb94653907faa6e0bb1c5ac3d279cc252 (diff)
parent97ef28ad9aa2f34aea0779062976ad4294c0af51 (diff)
downloadmpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.bz2
mpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.xz
Merge svn changes up to r30876
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6fcf358b0b..b2735bd913 100644
--- a/Makefile
+++ b/Makefile
@@ -313,6 +313,7 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \
loader/dshow/DS_VideoDecoder.c \
loader/dshow/allocator.c \
loader/dshow/cmediasample.c \
+ loader/dshow/graph.c \
loader/dshow/guids.c \
loader/dshow/inputpin.c \
loader/dshow/mediatype.c \
@@ -425,6 +426,7 @@ SRCS_COMMON = asxparser.c \
libmpcodecs/vf_field.c \
libmpcodecs/vf_fil.c \
libmpcodecs/vf_filmdint.c \
+ libmpcodecs/vf_fixpts.c \
libmpcodecs/vf_flip.c \
libmpcodecs/vf_format.c \
libmpcodecs/vf_framestep.c \