diff options
author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-05 18:56:31 +0000 |
---|---|---|
committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-05 18:56:31 +0000 |
commit | aca23967944e3e0d43f66e56ad9ef57e0a1e8684 (patch) | |
tree | 174c905c8e32f7a4b071ebcb675eef61a3495a71 /libmpcodecs | |
parent | 722581780feea52a838d13e6d16fc920c0251ff4 (diff) | |
download | mpv-aca23967944e3e0d43f66e56ad9ef57e0a1e8684.tar.bz2 mpv-aca23967944e3e0d43f66e56ad9ef57e0a1e8684.tar.xz |
Initialize fontconfig in VFCTRL_INIT_EOSD handler.
Recent libass api changes moved fontconfig initialization to filter's
config() function. It is bad, because cache update can take a long time,
resulting in unpleasant sound effects. This change restores the original
behaviour.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20722 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_ass.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_vo.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index fc2c06b4fc..3fed4f159c 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -350,7 +350,9 @@ static int control(vf_instance_t *vf, int request, void *data) switch (request) { case VFCTRL_INIT_EOSD: vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); - return vf->priv->ass_priv ? CONTROL_TRUE : CONTROL_FALSE; + if (!vf->priv->ass_priv) return CONTROL_FALSE; + ass_configure_fonts(vf->priv->ass_priv); + return CONTROL_TRUE; case VFCTRL_DRAW_EOSD: if (vf->priv->ass_priv) return CONTROL_TRUE; break; diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index b8e35543cc..f44d21d8e3 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -109,6 +109,7 @@ static int control(struct vf_instance_s* vf, int request, void* data) { vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); if (!vf->priv->ass_priv) return CONTROL_FALSE; + ass_configure_fonts(vf->priv->ass_priv); return CONTROL_TRUE; } case VFCTRL_DRAW_EOSD: |