summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-12 08:03:39 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-12 08:03:39 +0000
commit86ea8d4f4abf23672516fa0ca3378aa19c44bf2c (patch)
tree10eecb57936b5d99c9ef9671f030c2d78ca6d700 /libmpcodecs
parent40ac0d3109c4baeb10a04b503c6e6213c75d7779 (diff)
downloadmpv-86ea8d4f4abf23672516fa0ca3378aa19c44bf2c.tar.bz2
mpv-86ea8d4f4abf23672516fa0ca3378aa19c44bf2c.tar.xz
Fix build after FFmpeg symbol rename:
ff_eval2 --> ff_parse_and_eval_expr ff_parse_eval --> ff_eval_expr patch by ubitux, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31031 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_geq.c3
-rw-r--r--libmpcodecs/vf_qp.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c
index c8745c23c0..b69e2db56f 100644
--- a/libmpcodecs/vf_geq.c
+++ b/libmpcodecs/vf_geq.c
@@ -116,7 +116,8 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
const_values[3]=y;
for(x=0; x<w; x++){
const_values[2]=x;
- dst[x+y* dst_stride]= ff_parse_eval(vf->priv->e[plane], const_values, vf);
+ dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane],
+ const_values, vf);
}
}
}
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c
index 40db896fb9..0296a58b46 100644
--- a/libmpcodecs/vf_qp.c
+++ b/libmpcodecs/vf_qp.c
@@ -68,7 +68,7 @@ static int config(struct vf_instance *vf,
};
const char *error = NULL;
- vf->priv->lut[i+129]= lrintf(ff_eval2(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error));
+ vf->priv->lut[i+129]= lrintf(ff_parse_and_eval_expr(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error));
if (error)
mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\": %s\n", vf->priv->eq, error);
}