# HG changeset patch
# User alex
# Date 1070890230 0
# Node ID 7821a35b5dccda0d0ae2d1fc718f187c45d51a03
# Parent  2af52902e7dc23ca58068f943b632cd146e3665c
100l

diff -r 2af52902e7dc -r 7821a35b5dcc libvo/font_load_ft.c
--- a/libvo/font_load_ft.c	Mon Dec 08 13:25:35 2003 +0000
+++ b/libvo/font_load_ft.c	Mon Dec 08 13:30:30 2003 +0000
@@ -56,6 +56,7 @@
 int force_load_font;
 
 int using_freetype = 0;
+int font_fontconfig = 0;
 
 //// constants
 static unsigned int const colors = 256;
diff -r 2af52902e7dc -r 7821a35b5dcc mencoder.c
--- a/mencoder.c	Mon Dec 08 13:25:35 2003 +0000
+++ b/mencoder.c	Mon Dec 08 13:30:30 2003 +0000
@@ -177,7 +177,7 @@
 // sub:
 char *font_name=NULL;
 #ifdef HAVE_FONTCONFIG
-int font_fontconfig=0;
+extern int font_fontconfig;
 #endif
 float font_factor=0.75;
 char **sub_name=NULL;
diff -r 2af52902e7dc -r 7821a35b5dcc mplayer.c
--- a/mplayer.c	Mon Dec 08 13:25:35 2003 +0000
+++ b/mplayer.c	Mon Dec 08 13:30:30 2003 +0000
@@ -289,7 +289,7 @@
 // sub:
 char *font_name=NULL;
 #ifdef HAVE_FONTCONFIG
-int font_fontconfig=0;
+extern int font_fontconfig;
 #endif
 float font_factor=0.75;
 char **sub_name=NULL;