[MPlayer-cvslog] r33270 - trunk/libmpcodecs/vf_geq.c

[diego]

Author: diego
Date: Tue Apr 19 09:32:36 2011
New Revision: 33270

Log:
vf_geq: Fix FFmpeg API usage; eliminates some deprecation warnings.

libmpcodecs/vf_geq.c:118: warning: 'av_eval_expr' is deprecated (declared at ffmpeg/libavutil/eval.h:118)
libmpcodecs/vf_geq.c:178: warning: 'av_parse_expr' is deprecated (declared at ffmpeg/libavutil/eval.h:109)

patch by Alexis Ballier, alexis.ballier gmail com

Modified:
   trunk/libmpcodecs/vf_geq.c

Modified: trunk/libmpcodecs/vf_geq.c
==============================================================================
--- trunk/libmpcodecs/vf_geq.c	Sat Apr 16 05:35:56 2011	(r33269)
+++ trunk/libmpcodecs/vf_geq.c	Tue Apr 19 09:32:36 2011	(r33270)
@@ -115,7 +115,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] = av_expr_eval(vf->priv->e[plane],
                                                        const_values, vf);
             }
         }
@@ -175,7 +175,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 = 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]);