summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2017-06-06 22:16:29 +0200
committerwm4 <wm4@nowhere>2017-06-07 15:55:03 +0200
commit4d1ffecabc457e31e51c6331ed89304ff45dc671 (patch)
tree0960c2774385156648591dcfc0c93dea3e3b31a9 /sub
parentcd2baf6198ca24af22e7eb2905a0135d9619fd21 (diff)
downloadmpv-4d1ffecabc457e31e51c6331ed89304ff45dc671.tar.bz2
mpv-4d1ffecabc457e31e51c6331ed89304ff45dc671.tar.xz
options: slight cleanup of --sub-ass-style-override
List of changes: 1. Rename `signfs` to `scale`, to better match what it actually does (force --sub-scale to apply to ASS subtitles), and fix the blatantly wrong documentation (it actually specifically does *not* apply to signs) 2. Rename `--sub-ass-style-override` to `--sub-ass-override` to help reduce confusion between it and `--sub-ass-force-style`, as well as pointing out that it doesn't necessarily actually override styles. (The new `scale` option, for example, only sets ASS_OVERRIDE_BIT_FONT_SIZE, but not ASS_OVERRIDE_BIT_STYLE) 3. Mention that `--sub-ass-override` is generally sort of smart about only overriding dialog, not signs.
Diffstat (limited to 'sub')
-rw-r--r--sub/sd_ass.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index e81583c768..8a21ea0f42 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -313,7 +313,7 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
bool set_scale_by_window = true;
bool total_override = false;
// With forced overrides, apply the --sub-* specific options
- if (converted || opts->ass_style_override == 3) {
+ if (converted || opts->ass_style_override == 3) { // 'force'
set_scale_with_window = opts->sub_scale_with_window;
set_use_margins = opts->sub_use_margins;
set_scale_by_window = opts->sub_scale_by_window;
@@ -343,7 +343,7 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
int set_force_flags = 0;
if (total_override)
set_force_flags |= ASS_OVERRIDE_BIT_STYLE | ASS_OVERRIDE_BIT_FONT_SIZE;
- if (opts->ass_style_override == 4)
+ if (opts->ass_style_override == 4) // 'scale'
set_force_flags |= ASS_OVERRIDE_BIT_FONT_SIZE;
#if LIBASS_VERSION >= 0x01201001
if (converted)