[MPlayer-cvslog] r32099 - in trunk: libass/ass_mp.c libvo/font_load.h mencoder.c mplayer.c

[diego]

Author: diego
Date: Wed Sep  8 21:35:02 2010
New Revision: 32099

Log:
Refactor all font_fontconfig extern declarations to libvo/font_load.h.

Modified:
   trunk/libass/ass_mp.c
   trunk/libvo/font_load.h
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	Wed Sep  8 21:26:42 2010	(r32098)
+++ trunk/libass/ass_mp.c	Wed Sep  8 21:35:02 2010	(r32099)
@@ -55,7 +55,7 @@ char* ass_styles_file = NULL;
 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

Modified: trunk/libvo/font_load.h
==============================================================================
--- trunk/libvo/font_load.h	Wed Sep  8 21:26:42 2010	(r32098)
+++ trunk/libvo/font_load.h	Wed Sep  8 21:35:02 2010	(r32099)
@@ -94,6 +94,7 @@ extern int subtitle_autoscale;
 extern int vo_image_width;
 extern int vo_image_height;
 
+extern int font_fontconfig;
 extern int force_load_font;
 
 int init_freetype(void);

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Wed Sep  8 21:26:42 2010	(r32098)
+++ trunk/mencoder.c	Wed Sep  8 21:35:02 2010	(r32099)
@@ -181,7 +181,6 @@ static int play_n_frames_mf=-1;
 // 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;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Sep  8 21:26:42 2010	(r32098)
+++ trunk/mplayer.c	Wed Sep  8 21:35:02 2010	(r32099)
@@ -294,7 +294,6 @@ char** audio_driver_list=NULL;
 // 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;