Mercurial > mplayer.hg

diff mencoder.c @ 7122:0dc9cb756b68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
freetype 2.0/2.1+ support - disabled by default until bugs fixed patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
author arpi
date Wed, 28 Aug 2002 20:52:02 +0000
parents 2e5c07262861
children eca7dbad0166
line wrap: on
line diff
--- a/mencoder.c	Wed Aug 28 20:45:42 2002 +0000
+++ b/mencoder.c	Wed Aug 28 20:52:02 2002 +0000
@@ -390,6 +390,9 @@
 
 // check font
 #ifdef USE_OSD
+#ifdef HAVE_FREETYPE
+  init_freetype();
+#else
   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);
@@ -400,6 +403,7 @@
        vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
   }
 #endif
+#endif
 
   vo_init_osd();