diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-28 10:21:30 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-28 10:21:30 +0000 |
| commit | ef45c3167f866362e367d56f8d8caf28ae785578 (patch) | |
| tree | 0089f074ef617148cd59ca9c11904edf2ed23f8b /libass | |
| parent | 6590c8d72f4d5f4e88ee91ac8c6a1a820eee9839 (diff) | |
| download | mpv-ef45c3167f866362e367d56f8d8caf28ae785578.tar.bz2 mpv-ef45c3167f866362e367d56f8d8caf28ae785578.tar.xz | |
If HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both
extern and static, causing compilation to fail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20485 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_mp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libass/ass_mp.c b/libass/ass_mp.c index 6b40c0eabf..331d2f78a8 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -41,7 +41,11 @@ char* ass_color = NULL; char* ass_border_color = NULL; char* ass_styles_file = NULL; +#ifdef HAVE_FONTCONFIG extern int font_fontconfig; +#else +static int font_fontconfig = 0; +#endif extern char* font_name; extern float text_font_scale_factor; extern int subtitle_autoscale; @@ -200,11 +204,6 @@ ass_track_t* ass_read_subdata(sub_data* subdata, double fps) { char *get_path(char *); extern char *font_name; -#ifdef HAVE_FONTCONFIG -extern int font_fontconfig; -#else -static int font_fontconfig = 0; -#endif void ass_configure(ass_instance_t* priv, int w, int h) { char *dir, *path, *family; |