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

[cehoyos]

Author: cehoyos
Date: Tue Jun  1 12:28:45 2010
New Revision: 31299

Log:
Fix compilation after FFmpeg r23402.

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

Modified: trunk/libmpcodecs/vf_geq.c
==============================================================================
--- trunk/libmpcodecs/vf_geq.c	Tue Jun  1 08:53:56 2010	(r31298)
+++ trunk/libmpcodecs/vf_geq.c	Tue Jun  1 12:28:45 2010	(r31299)
@@ -137,7 +137,7 @@ static void uninit(struct vf_instance *v
 //===========================================================================//
 static int vf_open(vf_instance_t *vf, char *args){
     char eq[3][2000] = { { 0 }, { 0 }, { 0 } };
-    int plane;
+    int plane, res;
 
     vf->config=config;
     vf->put_image=put_image;
@@ -178,9 +178,9 @@ static int vf_open(vf_instance_t *vf, ch
             plane==0 ? lum : (plane==1 ? cb : cr),
             NULL
         };
-        vf->priv->e[plane] = ff_parse_expr(eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL);
+        res = ff_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL);
 
-        if (!vf->priv->e[plane]) {
+        if (res < 0) {
             mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]);
             return 0;
         }

Modified: trunk/libmpcodecs/vf_qp.c
==============================================================================
--- trunk/libmpcodecs/vf_qp.c	Tue Jun  1 08:53:56 2010	(r31298)
+++ trunk/libmpcodecs/vf_qp.c	Tue Jun  1 12:28:45 2010	(r31299)
@@ -67,10 +67,11 @@ static int config(struct vf_instance *vf
                 NULL
             };
             double temp_val;
+	    int res;
 
-            temp_val= ff_parse_and_eval_expr(vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
+            res= ff_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
 
-            if (isnan(temp_val)){
+            if (res < 0){
                 mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq);
                 return 0;
             }