diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
commit | a2037a2effbd4622d0e8336245a9b14c3f886bde (patch) | |
tree | bd2face6dd36d2663197b23a33da9e9b2814f70c /libvo/font_load_ft.c | |
parent | 0c2773a709276681575d2507aa60ee85c2d0b850 (diff) | |
parent | 43079c51daa8c12b0a44e5ad8022c979dd9e8336 (diff) | |
download | mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.bz2 mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.xz |
Merge svn changes up to r29412
Diffstat (limited to 'libvo/font_load_ft.c')
-rw-r--r-- | libvo/font_load_ft.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index d116d6cf11..f44c2c5796 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -71,7 +71,7 @@ int vo_image_height = 0; int force_load_font; int using_freetype = 0; -int font_fontconfig = 0; +int font_fontconfig = 1; //// constants static unsigned int const colors = 256; |