summaryrefslogtreecommitdiffstats
path: root/ass_mp.c
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@blackbox>2010-01-25 13:57:32 +0100
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-27 12:46:59 +0200
commit42a87fc6113bc14bbd14681e209a8c91c4b87a90 (patch)
tree272e1cdfe7dd867ed2a4d1563a03940f307f3342 /ass_mp.c
parente28e4a1b157bd0e9620fcff956d713a9921f506c (diff)
downloadmpv-42a87fc6113bc14bbd14681e209a8c91c4b87a90.tar.bz2
mpv-42a87fc6113bc14bbd14681e209a8c91c4b87a90.tar.xz
Disable libass fallbacks for fontconfig < 2.4.2
libass doesn't support fontconfig < 2.4.2 so fallbacks for these ancient versions aren't needed anymore. Also update the man page (English, German) to reflect the change. Additionally note that -embeddedfonts controls the use of ASS script embedded fonts too. -embeddedfonts is now always enabled by default. Fonts are never extracted into a directory anymore but passed to libass via memory.
Diffstat (limited to 'ass_mp.c')
-rw-r--r--ass_mp.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/ass_mp.c b/ass_mp.c
index ef2337e043..959f985446 100644
--- a/ass_mp.c
+++ b/ass_mp.c
@@ -41,11 +41,7 @@ float ass_font_scale = 1.;
float ass_line_spacing = 0.;
int ass_top_margin = 0;
int ass_bottom_margin = 0;
-#if defined(FC_VERSION) && (FC_VERSION >= 20402)
-int extract_embedded_fonts = 1;
-#else
-int extract_embedded_fonts = 0;
-#endif
+int use_embedded_fonts = 1;
char **ass_force_style_list = NULL;
int ass_use_margins = 0;
char *ass_color = NULL;
@@ -285,7 +281,7 @@ ASS_Library *ass_init(void)
priv = ass_library_init();
ass_set_message_cb(priv, message_callback, NULL);
ass_set_fonts_dir(priv, path);
- ass_set_extract_fonts(priv, extract_embedded_fonts);
+ ass_set_extract_fonts(priv, use_embedded_fonts);
ass_set_style_overrides(priv, ass_force_style_list);
free(path);
return priv;