Mercurial > mplayer.hg

comparison mencoder.c @ 21161:ad7747bce52d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make compilation depending on USE_OSD unconditional. USE_OSD was hardcoded to true in configure, manually turning it off would break compilation, and most OSD-related code wasn't affected by it anyway so it did nothing useful.
author uau
date Wed, 22 Nov 2006 19:21:16 +0000
parents fbd0f072faba
children dc98645820b7
comparison
equal deleted inserted replaced
21160:d2295c85cbdc 21161:ad7747bce52d
518 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio); 518 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio);
519 } 519 }
520 #endif 520 #endif
521 521
522 // check font 522 // check font
523 #ifdef USE_OSD
524 #ifdef HAVE_FREETYPE 523 #ifdef HAVE_FREETYPE
525 init_freetype(); 524 init_freetype();
526 #endif 525 #endif
527 #ifdef HAVE_FONTCONFIG 526 #ifdef HAVE_FONTCONFIG
528 if(!font_fontconfig) 527 if(!font_fontconfig)
539 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); 538 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
540 } 539 }
541 #endif 540 #endif
542 #ifdef HAVE_FONTCONFIG 541 #ifdef HAVE_FONTCONFIG
543 } 542 }
544 #endif
545 #endif 543 #endif
546 544
547 vo_init_osd(); 545 vo_init_osd();
548 546
549 /* HACK, for some weird reason, push() has to be called twice, 547 /* HACK, for some weird reason, push() has to be called twice,