summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-02 20:12:50 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-02 20:12:50 +0000
commit1c906775a05152340bcfb49a827ddf5612c5c1d3 (patch)
tree540bb586916a717656eedf5ab93d470165bff8b6 /libmpcodecs
parent1cbf1ec46835300d1226068487b90476aff73ce8 (diff)
downloadmpv-1c906775a05152340bcfb49a827ddf5612c5c1d3.tar.bz2
mpv-1c906775a05152340bcfb49a827ddf5612c5c1d3.tar.xz
ass_set_aspect_ratio() takes three arguments since 0x00907010.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_ass.c2
-rw-r--r--libmpcodecs/vf_vo.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index f2d3ebac08..40376796e4 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -92,7 +92,7 @@ static int config(struct vf_instance *vf,
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);
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 115aed411b..b16af88191 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -151,7 +151,7 @@ static int control(struct vf_instance *vf, int request, void* data)
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);