diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
commit | 0e1b7765be878491565cf5e471f22b15e106164c (patch) | |
tree | 422e500c289335182a2a64934dcabf10b95e32dc /libvo/font_load_ft.c | |
parent | a9618c1c6fe9424dfaeb1677348e0382d7252554 (diff) | |
parent | dcfd043ea8d0c46929aad78596314d837c290d39 (diff) | |
download | mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2 mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz |
Merge svn changes up to r29644
Diffstat (limited to 'libvo/font_load_ft.c')
-rw-r--r-- | libvo/font_load_ft.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index f44c2c5796..ae2c6cc2ba 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -1157,10 +1157,8 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n #ifdef CONFIG_FONTCONFIG if (font_fontconfig > 0) { - if (!font_name) - font_name = strdup("sans-serif"); FcInit(); - fc_pattern = FcNameParse(font_name); + fc_pattern = FcNameParse(font_name ? font_name : "sans-serif"); FcConfigSubstitute(0, fc_pattern, FcMatchPattern); FcDefaultSubstitute(fc_pattern); fc_pattern2 = fc_pattern; |