Mercurial > mplayer.hg

changeset 31233:01fdbb0aaa5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation after FFmpeg r23402.
author cehoyos
date Tue, 01 Jun 2010 10:28:45 +0000
parents 9f894134a0b3
children ef9fdc663e72
files libmpcodecs/vf_geq.c libmpcodecs/vf_qp.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_geq.c	Tue Jun 01 06:53:56 2010 +0000
+++ b/libmpcodecs/vf_geq.c	Tue Jun 01 10:28:45 2010 +0000
@@ -137,7 +137,7 @@
 //===========================================================================//
 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 @@
             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;
         }
--- a/libmpcodecs/vf_qp.c	Tue Jun 01 06:53:56 2010 +0000
+++ b/libmpcodecs/vf_qp.c	Tue Jun 01 10:28:45 2010 +0000
@@ -67,10 +67,11 @@
                 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;
             }