Mercurial > mplayer.hg

changeset 11584:7821a35b5dcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l
author alex
date Mon, 08 Dec 2003 13:30:30 +0000
parents 2af52902e7dc
children b44bf57aef04
files libvo/font_load_ft.c mencoder.c mplayer.c
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;
--- 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;