diff options
| author | wm4 <wm4@mplayer2.org> | 2012-05-20 11:42:44 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-05-20 11:42:44 +0200 |
| commit | 2793e7eb70a342b346788f83e1ed660c8e0d491e (patch) | |
| tree | fe62d4ab03de24c568244b66f10990e09af3a370 /sub | |
| parent | 4488583dda2754a2e71ec991e9541bcc2c259da3 (diff) | |
| parent | f63dbaddb6de6add6d987dc28ca8771aca230451 (diff) | |
| download | mpv-2793e7eb70a342b346788f83e1ed660c8e0d491e.tar.bz2 mpv-2793e7eb70a342b346788f83e1ed660c8e0d491e.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/font_load_ft.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/font_load_ft.c b/sub/font_load_ft.c index a501cfc750..eb6d70b657 100644 --- a/sub/font_load_ft.c +++ b/sub/font_load_ft.c @@ -1160,7 +1160,7 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n FcConfigSubstitute(0, fc_pattern, FcMatchPattern); FcDefaultSubstitute(fc_pattern); fc_pattern2 = fc_pattern; - fc_pattern = FcFontMatch(0, fc_pattern, 0); + fc_pattern = FcFontMatch(0, fc_pattern, &result); FcPatternDestroy(fc_pattern2); } // s doesn't need to be freed according to fontconfig docs |