diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
| commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
| tree | 87a087e69a0e2912183736de409676f824fb2248 /libmpcodecs | |
| parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
| parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
| download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz | |
Merge svn changes up to r31033
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_geq.c | 7 | ||||
| -rw-r--r-- | libmpcodecs/vf_gradfun.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_qp.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c index 1cd7b59f31..75749f8fa7 100644 --- a/libmpcodecs/vf_geq.c +++ b/libmpcodecs/vf_geq.c @@ -37,7 +37,7 @@ #include "libavcodec/eval.h" struct vf_priv_s { - AVEvalExpr * e[3]; + AVExpr * e[3]; int framenum; mp_image_t *mpi; }; @@ -116,7 +116,8 @@ 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_parse_eval(vf->priv->e[plane], const_values, vf); + dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane], + const_values, vf); } } } @@ -178,7 +179,7 @@ static int vf_open(vf_instance_t *vf, char *args){ NULL }; char * a; - vf->priv->e[plane] = ff_parse(eq[plane], const_names, NULL, NULL, func2, func2_names, &a); + vf->priv->e[plane] = ff_parse_expr(eq[plane], const_names, NULL, NULL, func2, func2_names, &a); if (!vf->priv->e[plane]) { mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s': %s\n", eq[plane], a); diff --git a/libmpcodecs/vf_gradfun.c b/libmpcodecs/vf_gradfun.c index ff53d8aa75..813b9ecb3f 100644 --- a/libmpcodecs/vf_gradfun.c +++ b/libmpcodecs/vf_gradfun.c @@ -188,7 +188,7 @@ static void filter_line_ssse3(uint8_t *dst, uint8_t *src, uint16_t *dc, } #endif // HAVE_SSSE3 -#if HAVE_6REGS && HAVE_SSE2 +#if HAVE_SSE2 && HAVE_6REGS #define BLURV(load)\ intptr_t x = -2*width;\ __asm__ volatile(\ @@ -385,7 +385,7 @@ static int vf_open(vf_instance_t *vf, char *args) vf->priv->blur_line = blur_line_c; vf->priv->filter_line = filter_line_c; -#if HAVE_6REGS && HAVE_SSE2 +#if HAVE_SSE2 && HAVE_6REGS if (gCpuCaps.hasSSE2) vf->priv->blur_line = blur_line_sse2; #endif diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index dbbf5134d1..841eff782b 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -68,7 +68,7 @@ static int config(struct vf_instance* vf, }; 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) mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\": %s\n", vf->priv->eq, error); } |