diff options
| author | Oneric <oneric@oneric.stub> | 2020-08-28 13:59:04 +0000 |
|---|---|---|
| committer | wm4 <1387750+wm4@users.noreply.github.com> | 2020-08-28 19:52:48 +0200 |
| commit | 91ce87bd89940b8b83d1bd044288008182cf3a2e (patch) | |
| tree | 0bd2af0283e4975fdba50b6574dbd655b613b159 | |
| parent | 7fa4ce35e7e037f3f7ed6b41914b12ab67b89d53 (diff) | |
| download | mpv-91ce87bd89940b8b83d1bd044288008182cf3a2e.tar.bz2 mpv-91ce87bd89940b8b83d1bd044288008182cf3a2e.tar.xz | |
sd_ass: replace deprecated ASS_OVERRIDE_BIT_FONT_SIZE
This requires a slightly more recent libass than before
| -rw-r--r-- | sub/sd_ass.c | 6 | ||||
| -rw-r--r-- | wscript | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c index eae1536df8..e5e12cbc04 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -418,13 +418,11 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim, ass_set_shaper(priv, opts->ass_shaper); int set_force_flags = 0; if (total_override) - set_force_flags |= ASS_OVERRIDE_BIT_STYLE | ASS_OVERRIDE_BIT_FONT_SIZE; + set_force_flags |= ASS_OVERRIDE_BIT_STYLE | ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE; if (opts->ass_style_override == 4) // 'scale' - set_force_flags |= ASS_OVERRIDE_BIT_FONT_SIZE; -#if LIBASS_VERSION >= 0x01201001 + set_force_flags |= ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE; 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; @@ -312,7 +312,7 @@ iconv support use --disable-iconv.", }, { 'name': 'libass', 'desc': 'SSA/ASS support', - 'func': check_pkg_config('libass', '>= 0.12.1'), + 'func': check_pkg_config('libass', '>= 0.12.2'), 'req': True, 'fmsg': "Unable to find development files for libass, or the version " + "found is too old. Aborting." |