Mercurial > mplayer.hg

changeset 30989:686241d65b86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author diego
date Mon, 12 Apr 2010 08:03:39 +0000
parents 8d840754a921
children 0ad2da052b2e
files libmpcodecs/vf_geq.c libmpcodecs/vf_qp.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_geq.c	Sun Apr 11 18:59:19 2010 +0000
+++ b/libmpcodecs/vf_geq.c	Mon Apr 12 08:03:39 2010 +0000
@@ -116,7 +116,8 @@
             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);
             }
         }
     }
--- a/libmpcodecs/vf_qp.c	Sun Apr 11 18:59:19 2010 +0000
+++ b/libmpcodecs/vf_qp.c	Mon Apr 12 08:03:39 2010 +0000
@@ -68,7 +68,7 @@
             };
 
             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);
         }