summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-16 23:03:59 +0200
committerwm4 <wm4@nowhere>2013-07-16 23:03:59 +0200
commit3d439368a16310cf162d41bd9bd7047608b1b42c (patch)
tree513dc5c2eca377166a0327ee9019094cb70cea6b
parent77a00e444f06675b4cfc1d75852aee76f7cbefad (diff)
downloadmpv-3d439368a16310cf162d41bd9bd7047608b1b42c.tar.bz2
mpv-3d439368a16310cf162d41bd9bd7047608b1b42c.tar.xz
sd_ass: fix font aspect ratio with non-ASS subs
For subtitles that were not ASS, the subtitle font aspect was always set to that of the video, the exact opposite of how it was supposed to behave.
-rw-r--r--sub/sd_ass.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 5e89ebe2d7..464a995e23 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -188,13 +188,13 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts,
if (pts == MP_NOPTS_VALUE || !sd->ass_renderer)
return;
- bool use_vs_aspect = !ctx->is_converted &&
- opts->ass_style_override ? opts->ass_vsfilter_aspect_compat : 1;
-
ASS_Renderer *renderer = sd->ass_renderer;
double scale = dim.display_par;
- if (use_vs_aspect)
+ if (!ctx->is_converted && (!opts->ass_style_override ||
+ opts->ass_vsfilter_aspect_compat))
+ {
scale = scale * dim.video_par;
+ }
mp_ass_configure(renderer, opts, &dim);
ass_set_aspect_ratio(renderer, scale, 1);
#if LIBASS_VERSION >= 0x01020000