# HG changeset patch
# User diego
# Date 1283974502 0
# Node ID c6a2fbf92fc308aa6afc634e34bd3d3bbd5279c1
# Parent  960f3f35ebda47076d89a003d6deb42587ab816c
Refactor all font_fontconfig extern declarations to libvo/font_load.h.

diff -r 960f3f35ebda -r c6a2fbf92fc3 libass/ass_mp.c
--- a/libass/ass_mp.c	Wed Sep 08 19:26:42 2010 +0000
+++ b/libass/ass_mp.c	Wed Sep 08 19:35:02 2010 +0000
@@ -55,7 +55,7 @@
 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd
 
 #ifdef CONFIG_FONTCONFIG
-extern int font_fontconfig;
+#include "libvo/font_load.h"
 #else
 static int font_fontconfig = -1;
 #endif
diff -r 960f3f35ebda -r c6a2fbf92fc3 libvo/font_load.h
--- a/libvo/font_load.h	Wed Sep 08 19:26:42 2010 +0000
+++ b/libvo/font_load.h	Wed Sep 08 19:35:02 2010 +0000
@@ -94,6 +94,7 @@
 extern int vo_image_width;
 extern int vo_image_height;
 
+extern int font_fontconfig;
 extern int force_load_font;
 
 int init_freetype(void);
diff -r 960f3f35ebda -r c6a2fbf92fc3 mencoder.c
--- a/mencoder.c	Wed Sep 08 19:26:42 2010 +0000
+++ b/mencoder.c	Wed Sep 08 19:35:02 2010 +0000
@@ -181,7 +181,6 @@
 // sub:
 char *font_name=NULL;
 char *sub_font_name=NULL;
-extern int font_fontconfig;
 float font_factor=0.75;
 char **sub_name=NULL;
 float sub_delay=0;
diff -r 960f3f35ebda -r c6a2fbf92fc3 mplayer.c
--- a/mplayer.c	Wed Sep 08 19:26:42 2010 +0000
+++ b/mplayer.c	Wed Sep 08 19:35:02 2010 +0000
@@ -294,7 +294,6 @@
 // sub:
 char *font_name=NULL;
 char *sub_font_name=NULL;
-extern int font_fontconfig;
 float font_factor=0.75;
 char **sub_name=NULL;
 float sub_delay=0;