Mercurial > mplayer.hg
comparison libass/ass_mp.c @ 32193:7773438f5abf
Remove pointless fontconfig #ifdefs and conditional font_fontconfig declaration.
This fixes compilation when fontconfig is disabled.
| author | diego |
|---|---|
| date | Thu, 16 Sep 2010 18:56:56 +0000 |
| parents | b8db5f35970b |
| children | 25bb8d59af90 |
comparison
equal
deleted
inserted
replaced
| 32192:b8db5f35970b | 32193:7773438f5abf |
|---|---|
| 48 char* ass_color = NULL; | 48 char* ass_color = NULL; |
| 49 char* ass_border_color = NULL; | 49 char* ass_border_color = NULL; |
| 50 char* ass_styles_file = NULL; | 50 char* ass_styles_file = NULL; |
| 51 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd | 51 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd |
| 52 | 52 |
| 53 #ifdef CONFIG_FONTCONFIG | |
| 54 #include "libvo/font_load.h" | |
| 55 #else | |
| 56 static int font_fontconfig = -1; | |
| 57 #endif | |
| 58 | |
| 59 #ifdef CONFIG_ICONV | 53 #ifdef CONFIG_ICONV |
| 60 #include "subreader.h" | 54 #include "subreader.h" |
| 61 #else | 55 #else |
| 62 static char* sub_cp = 0; | 56 static char* sub_cp = 0; |
| 63 #endif | 57 #endif |