[Mplayer-cvslog] CVS: main/Gui interface.c,1.67,1.68

[Arpi of Ize]

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var/tmp.root/cvs-serv30149/Gui

Modified Files:
	interface.c 
Log Message:
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 at bydg.pdi.net>


Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- interface.c	28 Dec 2002 14:36:03 -0000	1.67
+++ interface.c	29 Dec 2002 14:59:21 -0000	1.68
@@ -305,7 +305,7 @@
 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 )
   {