Mercurial > mplayer.hg
changeset 31238:1aba9097ed7d
ass_set_aspect_ratio() takes three arguments since 0x00907010.
| author | cehoyos |
|---|---|
| date | Wed, 02 Jun 2010 20:12:50 +0000 |
| parents | 878762329600 |
| children | 7567de05a9db |
| files | libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_ass.c Tue Jun 01 21:07:02 2010 +0000 +++ b/libmpcodecs/vf_ass.c Wed Jun 02 20:12:50 2010 +0000 @@ -92,7 +92,7 @@ if (vf->priv->ass_priv) { ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0); -#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000 +#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00907010 ass_set_aspect_ratio(vf->priv->ass_priv, 1, 1); #else ass_set_aspect_ratio(vf->priv->ass_priv, 1);
--- a/libmpcodecs/vf_vo.c Tue Jun 01 21:07:02 2010 +0000 +++ b/libmpcodecs/vf_vo.c Wed Jun 02 20:12:50 2010 +0000 @@ -151,7 +151,7 @@ double dar = (double) (res.w - res.ml - res.mr) / (res.h - res.mt - res.mb); ass_set_frame_size(vf->priv->ass_priv, res.w, res.h); ass_set_margins(vf->priv->ass_priv, res.mt, res.mb, res.ml, res.mr); -#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000 +#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00907010 ass_set_aspect_ratio(vf->priv->ass_priv, dar, (double)res.srcw/res.srch); #else ass_set_aspect_ratio(vf->priv->ass_priv, (double)res.w / res.h);