diff options
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/ass_mp.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 079afbe17e..36e03fb2d6 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -255,18 +255,23 @@ void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts, void mp_ass_configure_fonts(ASS_Renderer *priv, struct osd_style_opts *opts) { - char *dir, *path; - dir = get_path("fonts"); - path = get_path("subfont.ttf"); - if (!mp_path_exists(path)) { - free(path); - path = NULL; + char *default_font = get_path("subfont.ttf"); + char *config = get_path("fonts.conf"); + + if (!mp_path_exists(default_font)) { + free(default_font); + default_font = NULL; + } + + if (!mp_path_exists(config)) { + free(config); + config = NULL; } - ass_set_fonts(priv, path, opts->font, 1, NULL, 1); + ass_set_fonts(priv, default_font, opts->font, 1, config, 1); - free(dir); - free(path); + free(default_font); + free(config); } void mp_ass_render_frame(ASS_Renderer *renderer, ASS_Track *track, double time, |