Mercurial > mplayer.hg

diff libvo/sub.c @ 8635:81dbd28ef7c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>
author arpi
date Sun, 29 Dec 2002 14:59:23 +0000
parents 6ffbe7608013
children 056fc0a8b3d2
line wrap: on
line diff
--- a/libvo/sub.c	Sun Dec 29 14:36:56 2002 +0000
+++ b/libvo/sub.c	Sun Dec 29 14:59:23 2002 +0000
@@ -526,9 +526,9 @@
 
 #ifdef HAVE_FREETYPE    
     // here is the right place to get screen dimensions
-    if (force_load_font) {
+    if (!vo_font && force_load_font) {
 	force_load_font = 0;
-	load_font(dxs, dys);
+	load_font_ft(dxs, dys);
     }
 #endif