diff options
| author | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
| commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
| tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /sub/sd_ass.c | |
| parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
| parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) | |
| download | mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2 mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
Makefile
command.c
libvo/gl_common.c
libvo/vo_corevideo.m
libvo/vo_opengl.c
libvo/vo_opengl_old.c
libvo/vo_opengl_shaders.glsl
sub/ass_mp.c
sub/osd_libass.c
sub/sd_ass.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 44c91c6fdc..a5e23d74da 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -138,7 +138,9 @@ static void get_bitmaps(struct sh_sub *sh, struct osd_state *osd, return; double scale = params->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 = params->vsfilter_scale; ASS_Renderer *renderer = osd->ass_renderer; mp_ass_configure(renderer, opts, ¶ms->dim); |