Mercurial > mplayer.hg

diff mencoder.c @ 11580:90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
author: alex
date: Mon, 08 Dec 2003 12:14:32 +0000
parents: b293b4eb2c8c
children: 6ea42c885d60
--- a/mencoder.c	Mon Dec 08 12:03:03 2003 +0000
+++ b/mencoder.c	Mon Dec 08 12:14:32 2003 +0000
@@ -175,6 +175,9 @@
 
 // sub:
 char *font_name=NULL;
+#ifdef HAVE_FONTCONFIG
+int font_fontconfig=0;
+#endif
 float font_factor=0.75;
 char **sub_name=NULL;
 float sub_delay=0;
@@ -443,7 +446,11 @@
 #ifdef USE_OSD
 #ifdef HAVE_FREETYPE
   init_freetype();
-#else
+#endif
+#ifdef HAVE_FONTCONFIG
+  if(!font_fontconfig)
+  {
+#endif
   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);
@@ -453,6 +460,8 @@
        if(!vo_font)
        vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
   }
+#ifdef HAVE_FONTCONFIG
+  }
 #endif
 #endif