Mercurial > mplayer.hg

comparison libmpcodecs/vf_vo.c @ 31238:1aba9097ed7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ass_set_aspect_ratio() takes three arguments since 0x00907010.
author cehoyos
date Wed, 02 Jun 2010 20:12:50 +0000
parents 957fe9c46d9c
children 4b738166e825
comparison
equal deleted inserted replaced
31237:878762329600 31238:1aba9097ed7d
149 memset(&res, 0, sizeof(res)); 149 memset(&res, 0, sizeof(res));
150 if (video_out->control(VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) { 150 if (video_out->control(VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) {
151 double dar = (double) (res.w - res.ml - res.mr) / (res.h - res.mt - res.mb); 151 double dar = (double) (res.w - res.ml - res.mr) / (res.h - res.mt - res.mb);
152 ass_set_frame_size(vf->priv->ass_priv, res.w, res.h); 152 ass_set_frame_size(vf->priv->ass_priv, res.w, res.h);
153 ass_set_margins(vf->priv->ass_priv, res.mt, res.mb, res.ml, res.mr); 153 ass_set_margins(vf->priv->ass_priv, res.mt, res.mb, res.ml, res.mr);
154 #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000 154 #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00907010
155 ass_set_aspect_ratio(vf->priv->ass_priv, dar, (double)res.srcw/res.srch); 155 ass_set_aspect_ratio(vf->priv->ass_priv, dar, (double)res.srcw/res.srch);
156 #else 156 #else
157 ass_set_aspect_ratio(vf->priv->ass_priv, (double)res.w / res.h); 157 ass_set_aspect_ratio(vf->priv->ass_priv, (double)res.w / res.h);
158 #endif 158 #endif
159 } 159 }