diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-08 13:01:14 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-08 13:01:14 +0000 |
| commit | b7971e6a402abf64dd74720144b159d5c6eb96bc (patch) | |
| tree | 3c39795ed66742bb7819d7274cd18d840bdf5e45 | |
| parent | 0f818d83ad83f521c903e521d04110aeeb454dbe (diff) | |
| download | mpv-b7971e6a402abf64dd74720144b159d5c6eb96bc.tar.bz2 mpv-b7971e6a402abf64dd74720144b159d5c6eb96bc.tar.xz | |
Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)
and warn that these are beta versions and not supported.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20111 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libass/ass_fontconfig.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index cc97250dd3..6850215a74 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -175,8 +175,12 @@ fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse) { mp_msg(MSGT_GLOBAL, MSGL_INFO, "[ass] Updating font cache\n"); + if (FcGetVersion() >= 20390 && FcGetVersion() < 20400) + mp_msg(MSGT_GLOBAL, MSGL_WARN, + "[ass] beta versions of fontconfig are not supported\n" + " update before reporting any bugs\n"); // FontConfig >= 2.4.0 updates cache automatically in FcConfigAppFontAddDir() - if (FcGetVersion() < 20400) { + if (FcGetVersion() < 20390) { FcFontSet* fcs; FcStrSet* fss; fcs = FcFontSetCreate(); |