summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkomh <komh@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-20 11:39:05 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-16 04:15:13 +0200
commit1eb15a1304049678136814f2f99ab89ac0d0b7cc (patch)
tree7c40d9690fe915833250eb3834c7bc4271ba6a03
parentda15a4de00470657eb44bb703448dab6dfaa448e (diff)
downloadmpv-1eb15a1304049678136814f2f99ab89ac0d0b7cc.tar.bz2
mpv-1eb15a1304049678136814f2f99ab89ac0d0b7cc.tar.xz
font_load_ft.c: disable -fontconfig if compiled without libfontconfig
Set the option value to disabled, not enabled, if the functionality is not available at all. Without this, -font and -subfont do not work when using -ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32636 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/font_load_ft.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 3c1ff55d19..41a0f886cb 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -70,7 +70,11 @@ int vo_image_height = 0;
int force_load_font;
int using_freetype = 0;
+#ifdef CONFIG_FONTCONFIG
int font_fontconfig = 1;
+#else
+int font_fontconfig = -1;
+#endif
//// constants
static unsigned int const colors = 256;