Mercurial > mplayer.hg

comparison mplayer.c @ 25351:f46e91c64b39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix libass to support -nofontconfig. For history reason, fontconfig is auto-enabled when ass is enabled, we keep this behavior and document it clearly.
author ulion
date Wed, 12 Dec 2007 10:00:34 +0000
parents 42aa06653705
children fec8936c8079
comparison
equal deleted inserted replaced
25350:2095f98cf0fa 25351:f46e91c64b39
2526 // check font 2526 // check font
2527 #ifdef HAVE_FREETYPE 2527 #ifdef HAVE_FREETYPE
2528 init_freetype(); 2528 init_freetype();
2529 #endif 2529 #endif
2530 #ifdef HAVE_FONTCONFIG 2530 #ifdef HAVE_FONTCONFIG
2531 if(!font_fontconfig) 2531 if(font_fontconfig <= 0)
2532 { 2532 {
2533 #endif 2533 #endif
2534 #ifdef HAVE_BITMAP_FONT 2534 #ifdef HAVE_BITMAP_FONT
2535 if(font_name){ 2535 if(font_name){
2536 vo_font=read_font_desc(font_name,font_factor,verbose>1); 2536 vo_font=read_font_desc(font_name,font_factor,verbose>1);