[Mplayer-cvslog] CVS: main mencoder.c,1.130,1.131

[Richard Felker CVS]

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

Modified Files:
	mencoder.c 
Log Message:
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.


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- mencoder.c	20 May 2002 03:25:21 -0000	1.130
+++ mencoder.c	2 Jun 2002 15:25:52 -0000	1.131
@@ -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){
@@ -403,6 +388,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);