Mercurial > mplayer.hg

comparison libmpcodecs/vf_ass.c @ 30065:d5d20b8256b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some ugly hacks to make compiling against a newer external version of libass work.
author reimar
date Thu, 24 Dec 2009 10:51:24 +0000
parents 3a3370c00ba6
children 595410bd114e
comparison
equal deleted inserted replaced
30064:73a32da1ef18 30065:d5d20b8256b7
92 vf->priv->planes[2] = malloc(vf->priv->outw * vf->priv->outh); 92 vf->priv->planes[2] = malloc(vf->priv->outw * vf->priv->outh);
93 vf->priv->dirty_rows = malloc(vf->priv->outh); 93 vf->priv->dirty_rows = malloc(vf->priv->outh);
94 94
95 if (vf->priv->ass_priv) { 95 if (vf->priv->ass_priv) {
96 ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0); 96 ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0);
97 #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000
98 ass_set_aspect_ratio(vf->priv->ass_priv, ((double)d_width) / d_height, ((double)width) / height);
99 #else
97 ass_set_aspect_ratio(vf->priv->ass_priv, ((double)d_width) / d_height); 100 ass_set_aspect_ratio(vf->priv->ass_priv, ((double)d_width) / d_height);
101 #endif
98 } 102 }
99 103
100 return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width, d_height, flags, outfmt); 104 return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width, d_height, flags, outfmt);
101 } 105 }
102 106