RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify vf_ass initialization. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19523 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2006-08-24 15:36:20 +00:00
parent fffeb2311b
commit 43a971a720
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libass/ass_render.c
View File

@ -178,20 +178,20 @@ ass_instance_t* ass_init(void)
if (family) free(family);
if (!fc_priv)
return 0;
goto ass_init_exit;
error = FT_Init_FreeType( &ft );
if ( error ) {
mp_msg(MSGT_GLOBAL, MSGL_FATAL, "FT_Init_FreeType failed\n");
fontconfig_done(fc_priv);
return 0;
goto ass_init_exit;
}
priv = calloc(1, sizeof(ass_instance_t));
if (!priv) {
FT_Done_FreeType(ft);
fontconfig_done(fc_priv);
return 0;
goto ass_init_exit;
}
priv->library = ft;
priv->fontconfig_priv = fc_priv;
@ -202,6 +202,10 @@ ass_instance_t* ass_init(void)
text_info.glyphs = calloc(MAX_GLYPHS, sizeof(glyph_info_t));
ass_init_exit:
if (priv) mp_msg(MSGT_GLOBAL, MSGL_INFO, "[ass] Init\n");
else mp_msg(MSGT_GLOBAL, MSGL_ERR, "[ass] Init failed\n");
return priv;
}

7
libmpcodecs/vf_ass.c
View File

@ -357,12 +357,7 @@ static int control(vf_instance_t *vf, int request, void *data)
{
if (request == VFCTRL_EOSD) {
vf->priv->ass_priv = ass_init();
if (!vf->priv->ass_priv) {
mp_msg(MSGT_VFILTER, MSGL_ERR, "[ass] Init failed\n");
return 0;
} else
mp_msg(MSGT_VFILTER, MSGL_INFO, "[ass] Init\n");
return CONTROL_TRUE;
return vf->priv->ass_priv ? CONTROL_TRUE : CONTROL_FALSE;
}
return vf_next_control(vf, request, data);
}