summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-21 18:31:34 +0200
committerwm4 <wm4@nowhere>2012-10-24 21:56:34 +0200
commit773668b6e85d4da4d252cb4ad8abd50448d70c7c (patch)
treedde60465367e01673f4eacf0b1e1de2f25f2c44e /Makefile
parent281989d38437d2a54810bf8638073d8a8cd0dfa0 (diff)
downloadmpv-773668b6e85d4da4d252cb4ad8abd50448d70c7c.tar.bz2
mpv-773668b6e85d4da4d252cb4ad8abd50448d70c7c.tar.xz
VF: rename vf_ass to vf_sub
This reflects the fact that this filter now renders all types of subtitles, not just ASS subtitles. Always compile this filter, not just on CONFIG_ASS. Note that --no-ass still disables auto-inserting this filter. It's the only way to disable auto-insertion, so keep it even though it's not really ASS specific anymore. --no-ass also disables using libass for rendering text subs directly.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dd476d2a28..7e566f06de 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,7 @@ SRCS_COMMON-$(FTP) += stream/stream_ftp.c
SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
-SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \
- sub/ass_mp.c \
- sub/sd_ass.c \
+SRCS_COMMON-$(LIBASS) += sub/ass_mp.c sub/sd_ass.c
SRCS_COMMON-$(LIBBLURAY) += stream/stream_bluray.c
SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c
@@ -171,6 +169,7 @@ SRCS_COMMON = asxparser.c \
libmpcodecs/vf_screenshot.c \
libmpcodecs/vf_softpulldown.c \
libmpcodecs/vf_stereo3d.c \
+ libmpcodecs/vf_sub.c \
libmpcodecs/vf_swapuv.c \
libmpcodecs/vf_unsharp.c \
libmpcodecs/vf_vo.c \