From fd44bbee3de65f95bdd9e5108b17277f1cac3d59 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 28 Aug 2002 20:52:02 +0000
Subject: freetype 2.0/2.1+ support - disabled by default until bugs fixed
 patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7123 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index 56e5411226..98dafa6e2a 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -390,6 +390,9 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
 
 // 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);
@@ -399,6 +402,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
        if(!vo_font)
        vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
   }
+#endif
 #endif
 
   vo_init_osd();
-- 
cgit v1.2.3