Author: siretart Date: Thu Jul 29 13:36:59 2010 New Revision: 31858 Log: Revert commit r31322 by cehoyos Modified: branches/1.0rc4/libmpcodecs/vf_geq.c branches/1.0rc4/libmpcodecs/vf_qp.c Modified: branches/1.0rc4/libmpcodecs/vf_geq.c ============================================================================== --- branches/1.0rc4/libmpcodecs/vf_geq.c Thu Jul 29 11:15:32 2010 (r31857) +++ branches/1.0rc4/libmpcodecs/vf_geq.c Thu Jul 29 13:36:59 2010 (r31858) @@ -34,7 +34,7 @@ #include "vf.h" #include "libavcodec/avcodec.h" -#include "libavutil/eval.h" +#include "libavcodec/eval.h" struct vf_priv_s { AVExpr * e[3]; @@ -116,7 +116,7 @@ static int put_image(struct vf_instance const_values[3]=y; for(x=0; x<w; x++){ const_values[2]=x; - dst[x + y * dst_stride] = av_eval_expr(vf->priv->e[plane], + dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane], const_values, vf); } } @@ -178,7 +178,7 @@ static int vf_open(vf_instance_t *vf, ch plane==0 ? lum : (plane==1 ? cb : cr), NULL }; - res = av_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); + res = ff_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); if (res < 0) { mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]); Modified: branches/1.0rc4/libmpcodecs/vf_qp.c ============================================================================== --- branches/1.0rc4/libmpcodecs/vf_qp.c Thu Jul 29 11:15:32 2010 (r31857) +++ branches/1.0rc4/libmpcodecs/vf_qp.c Thu Jul 29 13:36:59 2010 (r31858) @@ -32,7 +32,7 @@ #include "libvo/fastmemcpy.h" #include "libavcodec/avcodec.h" -#include "libavutil/eval.h" +#include "libavcodec/eval.h" struct vf_priv_s { @@ -69,7 +69,7 @@ static int config(struct vf_instance *vf double temp_val; 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= ff_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); if (res < 0){ mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq);