diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-16 19:26:19 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-16 19:26:19 +0000 |
| commit | bc1d60dcb7585b3c6115ed590a073573f39638b4 (patch) | |
| tree | 94fe6e2107b51c00cb122ad951fb4620acae68c0 | |
| parent | b397b28b31e8a57b71f90ef31dbdafad25fd5820 (diff) | |
| download | mpv-bc1d60dcb7585b3c6115ed590a073573f39638b4.tar.bz2 mpv-bc1d60dcb7585b3c6115ed590a073573f39638b4.tar.xz | |
Fix uninitialized memory access in ass_fontconfig.
This fixes hangups with plaintext subtitles happening when
the first subtitle is about to be displayed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28976 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libass/ass_fontconfig.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index d0042dcdfd..e8e759b4c7 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -160,11 +160,13 @@ static char* _select_font(fc_instance_t* priv, const char* family, int treat_fam goto error; #if (FC_VERSION >= 20297) + if (!treat_family_as_pattern) { // Remove all extra family names from original pattern. // After this, FcFontRenderPrepare will select the most relevant family // name in case there are more than one of them. for (; family_cnt > 1; --family_cnt) FcPatternRemove(pat, FC_FAMILY, family_cnt - 1); + } #endif rpat = FcFontRenderPrepare(priv->config, pat, fset->fonts[curf]); |