summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-29 14:59:23 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-29 14:59:23 +0000
commitc8b0ddfe4e1570b83b815a3c9befced24e4d2875 (patch)
treed0e864e177b24d068bea47f15a911d16a252ddc3 /Gui
parent7e26b6cc29c1f050f55152f0759cd2db276d107e (diff)
downloadmpv-c8b0ddfe4e1570b83b815a3c9befced24e4d2875.tar.bz2
mpv-c8b0ddfe4e1570b83b815a3c9befced24e4d2875.tar.xz
these patches let ,,oldstyle'' and freetype subtitle renderers live
together happily. if an oldstyle subtitle (font.desc) is found, it will be used. otherwise mplayer will choose subfont.ttf, if freetype was detected during ./configure. (also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too) patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/interface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gui/interface.c b/Gui/interface.c
index f4c93a1d34..9c62c28388 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -305,7 +305,7 @@ extern char ** vo_plugin_args;
void guiLoadFont( void )
{
#ifdef HAVE_FREETYPE
- load_font(vo_image_width, vo_image_height);
+ load_font_ft(vo_image_width, vo_image_height);
#else
if ( vo_font )
{