summaryrefslogtreecommitdiffstats
path: root/Gui/interface.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 20:52:02 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 20:52:02 +0000
commitfd44bbee3de65f95bdd9e5108b17277f1cac3d59 (patch)
tree4652fa878c4ee165fbea28d8d59abdcb3cfbabdc /Gui/interface.c
parent5e59ee334476b6fa1b557cb87d1dca8be24e02c3 (diff)
downloadmpv-fd44bbee3de65f95bdd9e5108b17277f1cac3d59.tar.bz2
mpv-fd44bbee3de65f95bdd9e5108b17277f1cac3d59.tar.xz
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
Diffstat (limited to 'Gui/interface.c')
-rw-r--r--Gui/interface.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gui/interface.c b/Gui/interface.c
index f2225f4e44..97d9d0c7e3 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -201,6 +201,9 @@ extern char ** vo_plugin_args;
#if defined( USE_OSD ) || defined( USE_SUB )
void guiLoadFont( void )
{
+#ifdef HAVE_FREETYPE
+ load_font(vo_image_width, vo_image_height);
+#else
if ( vo_font )
{
int i;
@@ -235,6 +238,7 @@ void guiLoadFont( void )
vo_font=read_font_desc( font_name,font_factor,0 );
}
}
+#endif
}
#endif