Mercurial > mplayer.hg

diff mplayer.c @ 19485:d04ee0eb6a11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support for disabling/enabling bitmap font support from configure
author diego
date Mon, 21 Aug 2006 23:19:11 +0000
parents bab82c53e433
children 10d8f2cae948
line wrap: on
line diff
--- a/mplayer.c	Mon Aug 21 22:02:49 2006 +0000
+++ b/mplayer.c	Mon Aug 21 23:19:11 2006 +0000
@@ -2840,6 +2840,7 @@
   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(!vo_font)
        vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
   }
+#endif
 #ifdef HAVE_FONTCONFIG
   }
 #endif