Mercurial > mplayer.hg

comparison libass/ass_mp.c @ 27393:4876c89bafdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d788e177a35e
children 9e739bdb049c
comparison
equal deleted inserted replaced
27392:f28981b3f233 27393:4876c89bafdd
30 #include "ass.h" 30 #include "ass.h"
31 #include "ass_utils.h" 31 #include "ass_utils.h"
32 #include "ass_mp.h" 32 #include "ass_mp.h"
33 #include "ass_library.h" 33 #include "ass_library.h"
34 34
35 #ifdef HAVE_FONTCONFIG 35 #ifdef CONFIG_FONTCONFIG
36 #include <fontconfig/fontconfig.h> 36 #include <fontconfig/fontconfig.h>
37 #endif 37 #endif
38 38
39 // libass-related command line options 39 // libass-related command line options
40 ass_library_t* ass_library; 40 ass_library_t* ass_library;
53 char* ass_color = NULL; 53 char* ass_color = NULL;
54 char* ass_border_color = NULL; 54 char* ass_border_color = NULL;
55 char* ass_styles_file = NULL; 55 char* ass_styles_file = NULL;
56 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd 56 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd
57 57
58 #ifdef HAVE_FONTCONFIG 58 #ifdef CONFIG_FONTCONFIG
59 extern int font_fontconfig; 59 extern int font_fontconfig;
60 #else 60 #else
61 static int font_fontconfig = -1; 61 static int font_fontconfig = -1;
62 #endif 62 #endif
63 extern char* font_name; 63 extern char* font_name;
64 extern char* sub_font_name; 64 extern char* sub_font_name;
65 extern float text_font_scale_factor; 65 extern float text_font_scale_factor;
66 extern int subtitle_autoscale; 66 extern int subtitle_autoscale;
67 67
68 #ifdef HAVE_ICONV 68 #ifdef CONFIG_ICONV
69 extern char* sub_cp; 69 extern char* sub_cp;
70 #else 70 #else
71 static char* sub_cp = 0; 71 static char* sub_cp = 0;
72 #endif 72 #endif
73 73