From e8733cbf9d0355eed05d04e2f8c010ac8282c203 Mon Sep 17 00:00:00 2001 From: eugeni Date: Thu, 26 Oct 2006 20:08:46 +0000 Subject: Split ass_configure() into several smaller functions. FontConfig initialization moved from ass_init() to ass_set_fonts(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20462 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_ass.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'libmpcodecs/vf_ass.c') diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index 46273d47c6..922f268b0a 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -77,8 +77,6 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { - ass_settings_t settings; - if (outfmt == IMGFMT_IF09) return 0; vf->priv->outh = height + ass_top_margin + ass_bottom_margin; @@ -94,17 +92,8 @@ static int config(struct vf_instance_s* vf, vf->priv->dirty_rows = malloc(vf->priv->outh); if (vf->priv->ass_priv) { - memset(&settings, 0, sizeof(ass_settings_t)); - settings.frame_width = vf->priv->outw; - settings.frame_height = vf->priv->outh; - settings.font_size_coeff = ass_font_scale; - settings.line_spacing = ass_line_spacing; - settings.top_margin = ass_top_margin; - settings.bottom_margin = ass_bottom_margin; - settings.use_margins = ass_use_margins; - settings.aspect = ((double)d_width) / d_height; - - ass_configure(vf->priv->ass_priv, &settings); + ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh); + ass_set_aspect_ratio(vf->priv->ass_priv, ((double)d_width) / d_height); } return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width, d_height, flags, outfmt); -- cgit v1.2.3