From d02f03bc2b98bd6e0ed84e7627be7de02dce7a9c Mon Sep 17 00:00:00 2001 From: llyyr Date: Sun, 15 Sep 2024 15:56:08 +0530 Subject: [PATCH] sub/sd_ass: don't override event attributes to mpv defaults ASS_OVERRIDE_BIT_STYLE includes ASS_OVERRIDE_BIT_ATTRIBUTES, which we don't want. This prevents --sub-ass-override=force from overriding attributes such as bold, italics, underline or strikeout to mpv defaults. --- sub/sd_ass.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 4f82bc470c..47b3109ec7 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -534,8 +534,13 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim, ass_set_line_position(priv, set_sub_pos); ass_set_shaper(priv, opts->ass_shaper); int set_force_flags = 0; - if (total_override) - set_force_flags |= ASS_OVERRIDE_BIT_STYLE | ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE; + if (total_override) { + set_force_flags |= ASS_OVERRIDE_BIT_FONT_NAME + | ASS_OVERRIDE_BIT_FONT_SIZE_FIELDS + | ASS_OVERRIDE_BIT_COLORS + | ASS_OVERRIDE_BIT_BORDER + | ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE; + } if (shared_opts->ass_style_override[sd->order] == ASS_STYLE_OVERRIDE_SCALE) set_force_flags |= ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE; if (converted)