[MPlayer-cvslog] r20485 - trunk/libass/ass_mp.c

[reimar]

Author: reimar
Date: Sat Oct 28 12:21:30 2006
New Revision: 20485

Modified:
   trunk/libass/ass_mp.c

Log:
If HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both
extern and static, causing compilation to fail


Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	(original)
+++ trunk/libass/ass_mp.c	Sat Oct 28 12:21:30 2006
@@ -41,7 +41,11 @@
 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 @@
 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;