summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cfg-mplayer.h2
-rw-r--r--mplayer.c4
-rw-r--r--options.h1
-rw-r--r--sub/ass_mp.c2
-rw-r--r--sub/ass_mp.h1
5 files changed, 5 insertions, 5 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 93fb58f480..b767d1c0f1 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -710,7 +710,7 @@ const m_option_t common_opts[] = {
{"noass-use-margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"embeddedfonts", &use_embedded_fonts, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noembeddedfonts", &use_embedded_fonts, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"ass-force-style", &ass_force_style_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
+ OPT_STRINGLIST("ass-force-style", ass_force_style_list, 0),
{"ass-color", &ass_color, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"ass-border-color", &ass_border_color, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"ass-styles", &ass_styles_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
diff --git a/mplayer.c b/mplayer.c
index af6f724188..0f36247c16 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -4230,7 +4230,9 @@ while (opts->player_idle_mode && !mpctx->filename) {
}
}
//---------------------------------------------------------------------------
-
+#ifdef CONFIG_ASS
+ ass_set_style_overrides(mpctx->ass_library, opts->ass_force_style_list);
+#endif
if (mpctx->video_out && mpctx->sh_video && mpctx->video_out->config_ok)
vo_control(mpctx->video_out, VOCTRL_RESUME, NULL);
diff --git a/options.h b/options.h
index 61f77053bc..46d1cf85b7 100644
--- a/options.h
+++ b/options.h
@@ -91,6 +91,7 @@ typedef struct MPOpts {
char **sub_paths;
int sub_auto;
int ass_enabled;
+ char **ass_force_style_list;
struct lavc_param {
int workaround_bugs;
int error_resilience;
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index d39781ef9d..9a7b89a1ed 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -46,7 +46,6 @@ float ass_line_spacing = 0.;
int ass_top_margin = 0;
int ass_bottom_margin = 0;
int use_embedded_fonts = 1;
-char **ass_force_style_list = NULL;
int ass_use_margins = 0;
char *ass_color = NULL;
char *ass_border_color = NULL;
@@ -313,7 +312,6 @@ ASS_Library *mp_ass_init(void)
ass_set_message_cb(priv, message_callback, NULL);
ass_set_fonts_dir(priv, path);
ass_set_extract_fonts(priv, use_embedded_fonts);
- ass_set_style_overrides(priv, ass_force_style_list);
free(path);
return priv;
}
diff --git a/sub/ass_mp.h b/sub/ass_mp.h
index 33ee90c18f..0e60b71103 100644
--- a/sub/ass_mp.h
+++ b/sub/ass_mp.h
@@ -36,7 +36,6 @@ extern float ass_line_spacing;
extern int ass_top_margin;
extern int ass_bottom_margin;
extern int use_embedded_fonts;
-extern char **ass_force_style_list;
extern int ass_use_margins;
extern char *ass_color;
extern char *ass_border_color;