diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 20:52:02 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 20:52:02 +0000 |
| commit | fd44bbee3de65f95bdd9e5108b17277f1cac3d59 (patch) | |
| tree | 4652fa878c4ee165fbea28d8d59abdcb3cfbabdc /mencoder.c | |
| parent | 5e59ee334476b6fa1b557cb87d1dca8be24e02c3 (diff) | |
| download | mpv-fd44bbee3de65f95bdd9e5108b17277f1cac3d59.tar.bz2 mpv-fd44bbee3de65f95bdd9e5108b17277f1cac3d59.tar.xz | |
freetype 2.0/2.1+ support - disabled by default until bugs fixed
patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7123 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index 56e5411226..98dafa6e2a 100644 --- a/mencoder.c +++ b/mencoder.c @@ -390,6 +390,9 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ // check font #ifdef USE_OSD +#ifdef HAVE_FREETYPE + init_freetype(); +#else 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); @@ -400,6 +403,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1); } #endif +#endif vo_init_osd(); |