diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-08 13:30:30 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-08 13:30:30 +0000 |
commit | 85f98092f5de87ada0d95cf0686c71fd1bcfc5d0 (patch) | |
tree | e748a269c8011a1c9654396bb3977ae6cfb7c814 | |
parent | 28a127d80bb6363d47a3212409f05b5b0b687240 (diff) |
100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11585 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libvo/font_load_ft.c | 1 | ||||
-rw-r--r-- | mencoder.c | 2 | ||||
-rw-r--r-- | mplayer.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 3279d98361..dd86172e2a 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -56,6 +56,7 @@ int vo_image_height = 0; int force_load_font; int using_freetype = 0; +int font_fontconfig = 0; //// constants static unsigned int const colors = 256; diff --git a/mencoder.c b/mencoder.c index 0097bdaf31..c6195e9ec8 100644 --- a/mencoder.c +++ b/mencoder.c @@ -177,7 +177,7 @@ static int play_n_frames_mf=-1; // 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; @@ -289,7 +289,7 @@ extern int vo_flags; // 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; |