1
mirror of https://github.com/mpv-player/mpv synced 2024-10-30 04:46:41 +01:00

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
This commit is contained in:
diego 2010-04-12 08:03:39 +00:00
parent 40ac0d3109
commit 86ea8d4f4a
2 changed files with 3 additions and 2 deletions

View File

@ -116,7 +116,8 @@ 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]= 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);
} }
} }
} }

View File

@ -68,7 +68,7 @@ static int config(struct vf_instance *vf,
}; };
const char *error = NULL; 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) if (error)
mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\": %s\n", vf->priv->eq, error); mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\": %s\n", vf->priv->eq, error);
} }