[MPlayer-cvslog] r31031 - in trunk/libmpcodecs: vf_geq.c vf_qp.c

[diego]

Author: diego
Date: Mon Apr 12 10:03:39 2010
New Revision: 31031

Log:
Fix build after FFmpeg symbol rename:
ff_eval2      --> ff_parse_and_eval_expr
ff_parse_eval --> ff_eval_expr
patch by ubitux, ubitux gmail com

Modified:
   trunk/libmpcodecs/vf_geq.c
   trunk/libmpcodecs/vf_qp.c

Modified: trunk/libmpcodecs/vf_geq.c
==============================================================================
--- trunk/libmpcodecs/vf_geq.c	Sun Apr 11 20:59:19 2010	(r31030)
+++ trunk/libmpcodecs/vf_geq.c	Mon Apr 12 10:03:39 2010	(r31031)
@@ -116,7 +116,8 @@ 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]= 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);
             }
         }
     }

Modified: trunk/libmpcodecs/vf_qp.c
==============================================================================
--- trunk/libmpcodecs/vf_qp.c	Sun Apr 11 20:59:19 2010	(r31030)
+++ trunk/libmpcodecs/vf_qp.c	Mon Apr 12 10:03:39 2010	(r31031)
@@ -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);
         }