diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /sub/sd_ass.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'sub/sd_ass.c')
| -rw-r--r-- | sub/sd_ass.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 31c66a6087..9b4d3763c5 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -333,6 +333,10 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim, if (converted) set_force_flags |= ASS_OVERRIDE_BIT_ALIGNMENT; #endif +#ifdef ASS_JUSTIFY_AUTO + if ((converted || opts->ass_style_override) && opts->ass_justify) + set_force_flags |= ASS_OVERRIDE_BIT_JUSTIFY; +#endif ass_set_selective_style_override_enabled(priv, set_force_flags); ASS_Style style = {0}; mp_ass_set_style(&style, 288, opts->sub_style); |