Mercurial > mplayer.hg
comparison mencoder.c @ 27393:4876c89bafdd
Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.
| author | diego |
|---|---|
| date | Thu, 07 Aug 2008 10:36:07 +0000 |
| parents | 1d2faa1020fb |
| children | 48c1ae64255b |
comparison
equal
deleted
inserted
replaced
| 27392:f28981b3f233 | 27393:4876c89bafdd |
|---|---|
| 528 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio); | 528 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio); |
| 529 } | 529 } |
| 530 #endif | 530 #endif |
| 531 | 531 |
| 532 // check font | 532 // check font |
| 533 #ifdef HAVE_FREETYPE | 533 #ifdef CONFIG_FREETYPE |
| 534 init_freetype(); | 534 init_freetype(); |
| 535 #endif | 535 #endif |
| 536 #ifdef HAVE_FONTCONFIG | 536 #ifdef CONFIG_FONTCONFIG |
| 537 if(font_fontconfig <= 0) | 537 if(font_fontconfig <= 0) |
| 538 { | 538 { |
| 539 #endif | 539 #endif |
| 540 #ifdef CONFIG_BITMAP_FONT | 540 #ifdef CONFIG_BITMAP_FONT |
| 541 if(font_name){ | 541 if(font_name){ |
| 546 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); | 546 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); |
| 547 if(!vo_font) | 547 if(!vo_font) |
| 548 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); | 548 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); |
| 549 } | 549 } |
| 550 #endif | 550 #endif |
| 551 #ifdef HAVE_FONTCONFIG | 551 #ifdef CONFIG_FONTCONFIG |
| 552 } | 552 } |
| 553 #endif | 553 #endif |
| 554 | 554 |
| 555 vo_init_osd(); | 555 vo_init_osd(); |
| 556 | 556 |