summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-21 23:19:11 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-21 23:19:11 +0000
commite8f5c06e76c47113cee16fc2a1fede24e5c3facf (patch)
tree3a3a54ec82505899d2a6aca0134066f82809e9b4 /mplayer.c
parent6e2e1a80e7713a9e1da2bf50ee5661c6d69d48a3 (diff)
downloadmpv-e8f5c06e76c47113cee16fc2a1fede24e5c3facf.tar.bz2
mpv-e8f5c06e76c47113cee16fc2a1fede24e5c3facf.tar.xz
support for disabling/enabling bitmap font support from configure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19491 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 45db6993b5..fc0a926b6f 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2840,6 +2840,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
if(!font_fontconfig)
{
#endif
+#ifdef HAVE_BITMAP_FONT
if(font_name){
vo_font=read_font_desc(font_name,font_factor,verbose>1);
if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
@@ -2850,6 +2851,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
if(!vo_font)
vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
}
+#endif
#ifdef HAVE_FONTCONFIG
}
#endif