Mercurial > mplayer.hg

changeset 6267:2e117fd620a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
font init needs to be after config parsing, otherwise -font won't work. not sure exactly where it should be, but right after config parsing seems to work fine.
author rfelker
date Sun, 02 Jun 2002 15:25:52 +0000
parents 6bc87a7619ab
children a96c2f444317
files mencoder.c
diffstat 1 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Sun Jun 02 12:52:20 2002 +0000
+++ b/mencoder.c	Sun Jun 02 15:25:52 2002 +0000
@@ -356,21 +356,6 @@
   }
 }
 
-// check font
-#ifdef USE_OSD
-  if(font_name){
-       vo_font=read_font_desc(font_name,font_factor,verbose>1);
-       if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
-  } else {
-      // try default:
-       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
-       if(!vo_font)
-       vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
-  }
-#endif
-
-  vo_init_osd();
-
   // FIXME: get rid of -dvd and other tricky options and config/playtree
   stream2=open_stream(frameno_filename,0,&i);
   if(stream2){
@@ -404,6 +389,21 @@
 
   mp_msg_set_level(verbose+MSGL_STATUS);
 
+// check font
+#ifdef USE_OSD
+  if(font_name){
+       vo_font=read_font_desc(font_name,font_factor,verbose>1);
+       if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
+  } else {
+      // try default:
+       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
+       if(!vo_font)
+       vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
+  }
+#endif
+
+  vo_init_osd();
+
   stream=open_stream(filename,vcd_track,&file_format);
 
   if(!stream){