Mercurial > mplayer.hg

changeset 32015:c6a2fbf92fc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor all font_fontconfig extern declarations to libvo/font_load.h.
author diego
date Wed, 08 Sep 2010 19:35:02 +0000
parents 960f3f35ebda
children 3a4d425d4bfa
files libass/ass_mp.c libvo/font_load.h mencoder.c mplayer.c
diffstat 4 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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);
--- 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;
--- 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;