diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-04-20 02:59:45 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-04-20 04:36:05 +0300 |
| commit | c33fafd6f1bc2a430c114231cecc6e1c56c1f939 (patch) | |
| tree | ffea28dc9b2845037a51cf3314b9b1f326fc1d2e /libmpcodecs/vf_geq.c | |
| parent | 726c28dd9bbaf49d28d78f21fabd6d2d8336b9cd (diff) | |
| download | mpv-c33fafd6f1bc2a430c114231cecc6e1c56c1f939.tar.bz2 mpv-c33fafd6f1bc2a430c114231cecc6e1c56c1f939.tar.xz | |
Update libav API uses
Update various code to use newer alternatives instead of deprecated
functions/fields that are being dropped at libav API bump. An
exception is avcodec_thread_init() which is being dropped even though
it's still _necessary_ with fairly recent libav versions, so there's
no good alternative which would work with both those recent versions
and latest libavcodec. I think there are grounds to consider the drop
premature and revert it for now; if that doesn't happen I'll add a
version-test #if check around it later.
Diffstat (limited to 'libmpcodecs/vf_geq.c')
| -rw-r--r-- | libmpcodecs/vf_geq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c index ed855d1b7d..68a9cf780c 100644 --- a/libmpcodecs/vf_geq.c +++ b/libmpcodecs/vf_geq.c @@ -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] = av_eval_expr(vf->priv->e[plane], + dst[x + y * dst_stride] = av_expr_eval(vf->priv->e[plane], const_values, vf); } } @@ -176,7 +176,7 @@ static int vf_open(vf_instance_t *vf, char *args){ 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 = av_expr_parse(&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]); |