[Mplayer-cvslog] CVS: main mplayer.c,1.638,1.639

[Arpi of Ize]

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

Modified Files:
	mplayer.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: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -r1.638 -r1.639
--- mplayer.c	29 Dec 2002 14:36:56 -0000	1.638
+++ mplayer.c	29 Dec 2002 14:58:58 -0000	1.639
@@ -894,7 +894,6 @@
 //------ load global data first ------
 
 #ifdef USE_OSD
-#ifndef HAVE_FREETYPE
 // check font
   if(font_name){
        vo_font=read_font_desc(font_name,font_factor,verbose>1);
@@ -905,8 +904,9 @@
        if(!vo_font)
        vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
   }
-#else
-  init_freetype();
+#ifdef HAVE_FREETYPE
+  if (!vo_font)
+	init_freetype();
 #endif
 #endif
   vo_init_osd();