summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-08-08 06:52:39 +0300
committerUoti Urpala <uau@mplayer2.org>2011-08-08 07:02:01 +0300
commit8d1e5354e43d25e839c953bd0319163cf6c95d82 (patch)
treecc9fab8b001adf47fa5cb1e1927ce3aaae072c66 /sub
parentf5d493d017519997ea1d5e09245a4dfa063698c7 (diff)
downloadmpv-8d1e5354e43d25e839c953bd0319163cf6c95d82.tar.bz2
mpv-8d1e5354e43d25e839c953bd0319163cf6c95d82.tar.xz
subs: libass: apply option changes to all track types
Libass rendering uses two renderer objects to support both VSFilter aspect ratio (mis)behavior emulation and correct rendering. When option values were changed during playback the changes were applied to the renderer used for the currently active track only, and old values could be used if the user then switched to a track using the other renderer object. Fix to update both renderers.
Diffstat (limited to 'sub')
-rw-r--r--sub/ass_mp.c6
-rw-r--r--sub/ass_mp.h3
2 files changed, 2 insertions, 7 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index 312a35a4a6..6fd50342c3 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -316,16 +316,12 @@ ASS_Library *mp_ass_init(void)
return priv;
}
-void mp_ass_reload_options(ASS_Renderer *priv, struct MPOpts *opts,
- bool *need_reload)
+void mp_ass_reload_options(ASS_Renderer *priv, struct MPOpts *opts)
{
- if (!*need_reload)
- return;
/* This could be needed for vf_ass case if the margins were actually
* runtime configurable, but would be wrong with EOSD:
* ass_set_margins(priv, ass_top_margin, ass_bottom_margin, 0, 0);
*/
ass_set_use_margins(priv, ass_use_margins);
ass_set_font_scale(priv, ass_font_scale);
- *need_reload = false;
}
diff --git a/sub/ass_mp.h b/sub/ass_mp.h
index 02c55c8a12..5658f4f8c1 100644
--- a/sub/ass_mp.h
+++ b/sub/ass_mp.h
@@ -52,8 +52,7 @@ void mp_ass_configure(ASS_Renderer *priv, int w, int h, bool unscaled);
void mp_ass_configure_fonts(ASS_Renderer *priv);
ASS_Library *mp_ass_init(void);
-void mp_ass_reload_options(ASS_Renderer *priv, struct MPOpts *opts,
- bool *need_reload);
+void mp_ass_reload_options(ASS_Renderer *priv, struct MPOpts *opts);
#else /* CONFIG_ASS */