diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-30 14:16:22 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-30 14:16:22 +0000 |
| commit | f1e8cbf6439cc572a942b4ccd309fd7519a74b5f (patch) | |
| tree | 9320a1897d7cc3326cabefd81a89cb3516c4d575 /libass/ass_mp.c | |
| parent | 6671a91eaf38e3206873e0608d2b711d1afc3c1e (diff) | |
| download | mpv-f1e8cbf6439cc572a942b4ccd309fd7519a74b5f.tar.bz2 mpv-f1e8cbf6439cc572a942b4ccd309fd7519a74b5f.tar.xz | |
Remove libass dependency on global font_fontconfig variable.
A new function (ass_set_fonts_nofc) is introduced instead of an extra argument
to existing ass_set_fonts to keep binary compatibility with older versions of
the library.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26614 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_mp.c')
| -rw-r--r-- | libass/ass_mp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libass/ass_mp.c b/libass/ass_mp.c index b3b3963eef..5fa2cd53c2 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -242,7 +242,10 @@ void ass_configure_fonts(ass_renderer_t* priv) { else if (font_fontconfig >= 0 && font_name) family = strdup(font_name); else family = 0; - ass_set_fonts(priv, path, family); + if (font_fontconfig >= 0) + ass_set_fonts(priv, path, family); + else + ass_set_fonts_nofc(priv, path, family); free(dir); free(path); |