From 3d82a558e6f25564a4749c3b099b8f24ac78fb67 Mon Sep 17 00:00:00 2001 From: rfelker Date: Sun, 2 Jun 2002 15:25:52 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6268 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mencoder.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'mencoder.c') diff --git a/mencoder.c b/mencoder.c index 7827c57950..d9717afcdd 100644 --- a/mencoder.c +++ b/mencoder.c @@ -356,21 +356,6 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ } } -// 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 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ 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){ -- cgit v1.2.3