Commit e40cfb14 authored by Stefano Sabatini's avatar Stefano Sabatini

mp: remove use of deprecated old eval API

The old API was deprecated and will be possibly removed, fix warnings
in libavfilter/libmpcodecs/vf_geq.c and libavfilter/libmpcodecs/vf_qp.c.
Signed-off-by: 's avatarStefano Sabatini <stefano.sabatini-lala@poste.it>
parent 20a16048
...@@ -116,7 +116,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ ...@@ -116,7 +116,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
const_values[3]=y; const_values[3]=y;
for(x=0; x<w; x++){ for(x=0; x<w; x++){
const_values[2]=x; const_values[2]=x;
dst[x + y * dst_stride] = av_eval_expr(vf->priv->e[plane], dst[x + y * dst_stride] = av_expr_eval(vf->priv->e[plane],
const_values, vf); const_values, vf);
} }
} }
...@@ -176,7 +176,7 @@ static int vf_open(vf_instance_t *vf, char *args){ ...@@ -176,7 +176,7 @@ static int vf_open(vf_instance_t *vf, char *args){
plane==0 ? lum : (plane==1 ? cb : cr), plane==0 ? lum : (plane==1 ? cb : cr),
NULL NULL
}; };
res = av_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); res = av_expr_parse(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL);
if (res < 0) { if (res < 0) {
mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]); mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]);
......
...@@ -69,7 +69,7 @@ static int config(struct vf_instance *vf, ...@@ -69,7 +69,7 @@ static int config(struct vf_instance *vf,
double temp_val; double temp_val;
int res; int res;
res= av_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); res= av_expr_parse_and_eval(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
if (res < 0){ if (res < 0){
mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq); mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment