mirror of
https://github.com/mpv-player/mpv
synced 2024-12-23 15:22:09 +00:00
sd_ass: replace deprecated ASS_OVERRIDE_BIT_FONT_SIZE
This requires a slightly more recent libass than before
This commit is contained in:
parent
7fa4ce35e7
commit
91ce87bd89
@ -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;
|
||||
|
2
wscript
2
wscript
@ -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."
|
||||
|
Loading…
Reference in New Issue
Block a user