diff options
| author | wm4 <wm4@nowhere> | 2016-04-30 14:25:23 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-04-30 14:25:23 +0200 |
| commit | 3a8058658d3c0fadc607460d0411bbdea55a8edb (patch) | |
| tree | a09ba5fcc3268e33fa7b4a8994399ba8a923c376 /sub/sd_ass.c | |
| parent | 8d51f080104f33e6ba4b0749e0722e68c108ce23 (diff) | |
| download | mpv-3a8058658d3c0fadc607460d0411bbdea55a8edb.tar.bz2 mpv-3a8058658d3c0fadc607460d0411bbdea55a8edb.tar.xz | |
sd_add: replace --sub-ass=no with --ass-style-override=strip
--sub-ass=no / --ass=no still work, but --ass-style-override=strip is
preferred now. With this change, --ass-style-override can control all
the types of style overriding.
Diffstat (limited to 'sub/sd_ass.c')
| -rw-r--r-- | sub/sd_ass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 788b78f3a4..e52795f7eb 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -422,7 +422,8 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts, { struct sd_ass_priv *ctx = sd->priv; struct MPOpts *opts = sd->opts; - bool no_ass = !opts->ass_enabled || ctx->on_top; + bool no_ass = !opts->ass_enabled || ctx->on_top || + opts->ass_style_override == 5; bool converted = ctx->is_converted || no_ass; ASS_Track *track = no_ass ? ctx->shadow_track : ctx->ass_track; ASS_Renderer *renderer = ctx->ass_renderer; |