summaryrefslogtreecommitdiffstats
path: root/libass/ass_fontconfig.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 13:01:14 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 13:01:14 +0000
commit774a2730873f30542adb83f35e7c5b81e52c2f4a (patch)
treefb36eb7e50233eee06e347a353a7ab790225f773 /libass/ass_fontconfig.c
parent8710742e9a8cfc2cd0742ab8b0fb8b81b83156a9 (diff)
downloadlibass-774a2730873f30542adb83f35e7c5b81e52c2f4a.tar.bz2
libass-774a2730873f30542adb83f35e7c5b81e52c2f4a.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
Diffstat (limited to 'libass/ass_fontconfig.c')
-rw-r--r--libass/ass_fontconfig.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index cc97250..6850215 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();