RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2006-10-28 10:21:30 +00:00
parent 6590c8d72f
commit ef45c3167f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libass/ass_mp.c
View File

@ -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;