diff options
| author | wm4 <wm4@nowhere> | 2012-10-21 18:31:34 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 21:56:34 +0200 |
| commit | 773668b6e85d4da4d252cb4ad8abd50448d70c7c (patch) | |
| tree | dde60465367e01673f4eacf0b1e1de2f25f2c44e /libmpcodecs | |
| parent | 281989d38437d2a54810bf8638073d8a8cd0dfa0 (diff) | |
| download | mpv-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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_sub.c (renamed from libmpcodecs/vf_ass.c) | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 5ec7d19570..9ea17f978c 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -64,7 +64,7 @@ extern const vf_info_t vf_info_divtc; extern const vf_info_t vf_info_softskip; extern const vf_info_t vf_info_screenshot; extern const vf_info_t vf_info_screenshot_force; -extern const vf_info_t vf_info_ass; +extern const vf_info_t vf_info_sub; extern const vf_info_t vf_info_yadif; extern const vf_info_t vf_info_stereo3d; extern const vf_info_t vf_info_dlopen; @@ -102,9 +102,7 @@ static const vf_info_t *const filter_list[] = { &vf_info_delogo, &vf_info_phase, &vf_info_divtc, -#ifdef CONFIG_ASS - &vf_info_ass, -#endif + &vf_info_sub, &vf_info_yadif, &vf_info_stereo3d, &vf_info_dlopen, diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h index 7db9bd5808..4c50f0e9cc 100644 --- a/libmpcodecs/vf.h +++ b/libmpcodecs/vf.h @@ -106,7 +106,7 @@ struct vf_ctrl_screenshot { #define VFCTRL_INIT_OSD 15 // Filter OSD renderer present? #define VFCTRL_SET_DEINTERLACE 18 // Set deinterlacing status #define VFCTRL_GET_DEINTERLACE 19 // Get deinterlacing status -/* Hack to make the OSD state object available to vf_expand and vf_ass which +/* Hack to make the OSD state object available to vf_sub which * access OSD/subtitle state outside of normal OSD draw time. */ #define VFCTRL_SET_OSD_OBJ 20 #define VFCTRL_SET_YUV_COLORSPACE 22 // arg is struct mp_csp_details* diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_sub.c index 1da0b03b44..e377d589c5 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_sub.c @@ -289,7 +289,7 @@ static int vf_open(vf_instance_t *vf, char *args) } if (vf->priv->auto_insert) - mp_msg(MSGT_ASS, MSGL_INFO, "[ass] auto-open\n"); + mp_msg(MSGT_ASS, MSGL_INFO, "[sub] auto-open\n"); vf->config = config; vf->query_format = query_format; @@ -308,15 +308,15 @@ static const m_option_t vf_opts_fields[] = { }; static const m_struct_t vf_opts = { - "ass", + "sub", sizeof(struct vf_priv_s), &vf_priv_dflt, vf_opts_fields }; -const vf_info_t vf_info_ass = { - "Render ASS/SSA subtitles", - "ass", +const vf_info_t vf_info_sub = { + "Render subtitles", + "sub", "Evgeniy Stepanov", "", vf_open, |