diff options
author | wm4 <wm4@nowhere> | 2012-10-12 10:17:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-12 11:53:53 +0200 |
commit | 85d185441acf4691c830db2f40235ac927410d45 (patch) | |
tree | 211177793cd5d6b399346be661af8e7528f0f411 /sub/sd_ass.c | |
parent | 65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff) | |
parent | e1b15dee4c250bf6509594e241eb2856c8d21e0f (diff) | |
download | mpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2 mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz |
Merge branch 'input_changes' into master
Conflicts:
DOCS/man/en/vo.rst
etc/input.conf
input/input.c
m_property.c
Diffstat (limited to 'sub/sd_ass.c')
-rw-r--r-- | sub/sd_ass.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 9295cab07d..fcedc9fec5 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -135,7 +135,9 @@ static void get_bitmaps(struct sh_sub *sh, struct osd_state *osd, return; double scale = osd->normal_scale; - if (ctx->vsfilter_aspect && opts->ass_vsfilter_aspect_compat) + bool use_vs_aspect = opts->ass_style_override + ? opts->ass_vsfilter_aspect_compat : 1; + if (ctx->vsfilter_aspect && use_vs_aspect) scale = osd->vsfilter_scale; ASS_Renderer *renderer = osd->ass_renderer; mp_ass_configure(renderer, opts, &osd->dim, osd->unscaled); |