summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-11 02:23:29 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:13:42 +0200
commitc9df2c8bd83b31375a79ab2bc4f854a53ff019c1 (patch)
tree033bb4a08d8aa13ab8ccec05ccae4588531637f0 /mplayer.c
parent2f6713bedeb77a7c058ce4954eb95ee7a2ca7119 (diff)
downloadmpv-c9df2c8bd83b31375a79ab2bc4f854a53ff019c1.tar.bz2
mpv-c9df2c8bd83b31375a79ab2bc4f854a53ff019c1.tar.xz
sub: add --ass-style-override option to disable style overrides
There are a number of options which modify ASS subtitle rendering. Most of these do things that can interfere with the styling done by subtitle scripts, resulting in incorrect rendering. Add the --ass-style-override option to make it easy to disable all overrides. This helps trouble- shooting, and makes it more practical to use the override features. (You can simply toggle the ass-style-override property at runtime, should one of the style override options break subtitle rendering at a certain point.) This mainly affects whether most --ass-* options are applied, as well as --sub-pos. Some things, like explicit style overrides loaded with --ass-force-style, can't be changed at runtime using the ass-style-override property.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 52316a8aa8..90e73bd7c8 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3739,7 +3739,8 @@ static void play_current_file(struct MPContext *mpctx)
}
#ifdef CONFIG_ASS
- ass_set_style_overrides(mpctx->ass_library, opts->ass_force_style_list);
+ if (opts->ass_style_override)
+ ass_set_style_overrides(mpctx->ass_library, opts->ass_force_style_list);
#endif
if (mpctx->video_out && mpctx->video_out->config_ok)
vo_control(mpctx->video_out, VOCTRL_RESUME, NULL);