summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-01-18 04:22:23 +0100
committerwm4 <wm4@mplayer2.org>2012-01-18 04:22:23 +0100
commit18b3348a73d8a9e81ca321dc1c17d6fc3cf2b79c (patch)
tree6a6a376b3e1e6673c42089ab17fc27ada5cf2fbc /Makefile
parent6e41497d5be1f107c18b2143fa45b3c46d6e95d3 (diff)
parentadc85b0031867bfc2296f2749e8544e8147b5b60 (diff)
downloadmpv-18b3348a73d8a9e81ca321dc1c17d6fc3cf2b79c.tar.bz2
mpv-18b3348a73d8a9e81ca321dc1c17d6fc3cf2b79c.tar.xz
Merge branch 'eosd' into my_master
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 55d69f9fa1..bdd340a097 100644
--- a/Makefile
+++ b/Makefile
@@ -403,6 +403,7 @@ SRCS_COMMON = asxparser.c \
libmpdemux/yuv4mpeg.c \
libmpdemux/yuv4mpeg_ratio.c \
libvo/osd.c \
+ libvo/eosd_packer.c \
osdep/numcores.c \
osdep/$(GETCH) \
osdep/$(TIMER) \