diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-05 23:34:17 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-05 23:35:42 +0300 |
| commit | dde8b753e417bb44e5f18ac9d6901deb95bf6ab0 (patch) | |
| tree | 84fc2a73fc1f514417cacd61c9a57580ca47cd66 /libmpcodecs | |
| parent | 331167ae132d35c821510307d8dd109ce27bfc1b (diff) | |
| parent | 09bca6575f66394e1f4ba3845330d21d30895f3d (diff) | |
| download | mpv-dde8b753e417bb44e5f18ac9d6901deb95bf6ab0.tar.bz2 mpv-dde8b753e417bb44e5f18ac9d6901deb95bf6ab0.tar.xz | |
Merge svn changes r31318 to r31328
r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_geq.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_qp.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c index 55645492e4..d783c5868c 100644 --- a/libmpcodecs/vf_geq.c +++ b/libmpcodecs/vf_geq.c @@ -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 @@ 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_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 @@ static int vf_open(vf_instance_t *vf, char *args){ 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]); diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index d3ae638f8c..30a3d8ce13 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -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 @@ static int config(struct vf_instance *vf, 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); |