Mercurial > mplayer.hg
changeset 31256:0d03e9c53d26
Fix compilation after FFmpeg r23485.
| author | cehoyos |
|---|---|
| date | Sat, 05 Jun 2010 13:44:20 +0000 |
| parents | e05d1ff84b61 |
| children | cce6efdfdb5b |
| files | libmpcodecs/vf_geq.c libmpcodecs/vf_qp.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_geq.c Sat Jun 05 11:38:19 2010 +0000 +++ b/libmpcodecs/vf_geq.c Sat Jun 05 13:44:20 2010 +0000 @@ -34,7 +34,7 @@ #include "vf.h" #include "libavcodec/avcodec.h" -#include "libavcodec/eval.h" +#include "libavutil/eval.h" struct vf_priv_s { AVExpr * e[3]; @@ -116,7 +116,7 @@ const_values[3]=y; for(x=0; x<w; x++){ const_values[2]=x; - dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane], + dst[x + y * dst_stride] = av_eval_expr(vf->priv->e[plane], const_values, vf); } } @@ -178,7 +178,7 @@ plane==0 ? lum : (plane==1 ? cb : cr), NULL }; - res = ff_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); + res = av_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]);
--- a/libmpcodecs/vf_qp.c Sat Jun 05 11:38:19 2010 +0000 +++ b/libmpcodecs/vf_qp.c Sat Jun 05 13:44:20 2010 +0000 @@ -32,7 +32,7 @@ #include "libvo/fastmemcpy.h" #include "libavcodec/avcodec.h" -#include "libavcodec/eval.h" +#include "libavutil/eval.h" struct vf_priv_s { @@ -69,7 +69,7 @@ double temp_val; int res; - res= ff_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); + res= av_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);