diff options
author | wm4 <wm4@nowhere> | 2015-02-16 20:04:15 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-02-16 20:04:29 +0100 |
commit | 2308b3a2a6e78c980a568320a44367e394a05238 (patch) | |
tree | 7523c45ce62ce3177e852b7ae21e27b22ac24424 /sub/sd_ass.c | |
parent | b63503db04dd38991216bc1bdf4ebc4f84f082e5 (diff) | |
download | mpv-2308b3a2a6e78c980a568320a44367e394a05238.tar.bz2 mpv-2308b3a2a6e78c980a568320a44367e394a05238.tar.xz |
sub: mess with styling defaults, change --ass-use-margins behavior
Now --ass-use-margins doesn't apply to normal subtitles anymore. This is
probably the inverse from the mpv behavior users expected so far, and
thus a breaking change, so rename the option, that the user at least has
a chance to lookup the option and decide whether the new behavior is
wanted or not.
The basic idea here is:
- plain text subtitles should have a certain useful defalt behavior,
like actually using margins
- ASS subtitles should never be broken by default
- ASS subtitles should look and behave like plaintext subtitles if
the --ass-style-override=force option is used
This also subtly changes --sub-scale-with-window and adds the --ass-
scale-with-window option. Since this one isn't so important, don't
bother with compatibility.
Diffstat (limited to 'sub/sd_ass.c')
-rw-r--r-- | sub/sd_ass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 9e08c2c3b6..73b836c98a 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -145,7 +145,7 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts, if (isnormal(par)) scale = par; } - mp_ass_configure(renderer, opts, &dim); + mp_ass_configure(renderer, opts, !ctx->is_converted, &dim); ass_set_aspect_ratio(renderer, scale, 1); #if LIBASS_VERSION >= 0x01020000 if (!ctx->is_converted && (!opts->ass_style_override || |