[FFmpeg-cvslog] r22844 - in trunk/libavcodec: eval.c eval.h ratecontrol.c

[stefano]

Author: stefano
Date: Mon Apr 12 00:32:01 2010
New Revision: 22844

Log:
Rename ff_parse_eval() to ff_eval_expr().

The new name expresses better what the function does.

Modified:
   trunk/libavcodec/eval.c
   trunk/libavcodec/eval.h
   trunk/libavcodec/ratecontrol.c

Modified: trunk/libavcodec/eval.c
==============================================================================
--- trunk/libavcodec/eval.c	Sun Apr 11 23:44:23 2010	(r22843)
+++ trunk/libavcodec/eval.c	Mon Apr 12 00:32:01 2010	(r22844)
@@ -410,7 +410,7 @@ end:
     return e;
 }
 
-double ff_parse_eval(AVExpr * e, const double *const_value, void *opaque) {
+double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque) {
     Parser p;
 
     p.const_value= const_value;
@@ -425,7 +425,7 @@ double ff_eval2(const char *s, const dou
     AVExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error);
     double d;
     if (!e) return NAN;
-    d = ff_parse_eval(e, const_value, opaque);
+    d = ff_eval_expr(e, const_value, opaque);
     ff_free_expr(e);
     return d;
 }

Modified: trunk/libavcodec/eval.h
==============================================================================
--- trunk/libavcodec/eval.h	Sun Apr 11 23:44:23 2010	(r22843)
+++ trunk/libavcodec/eval.h	Mon Apr 12 00:32:01 2010	(r22844)
@@ -30,7 +30,7 @@ typedef struct AVExpr AVExpr;
 
 /**
  * Parses and evaluates an expression.
- * Note, this is significantly slower than ff_parse_eval()
+ * Note, this is significantly slower than ff_eval_expr().
  *
  * @param s expression as a zero terminated string for example "1+2^3+5*5+sin(2/3)"
  * @param func1 NULL terminated array of function pointers for functions which take 1 argument
@@ -73,7 +73,7 @@ AVExpr * ff_parse(const char *s, const c
  * @param opaque a pointer which will be passed to all functions from func1 and func2
  * @return the value of the expression
  */
-double ff_parse_eval(AVExpr * e, const double *const_value, void *opaque);
+double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque);
 
 /**
  * Frees a parsed expression previously created with ff_parse().

Modified: trunk/libavcodec/ratecontrol.c
==============================================================================
--- trunk/libavcodec/ratecontrol.c	Sun Apr 11 23:44:23 2010	(r22843)
+++ trunk/libavcodec/ratecontrol.c	Mon Apr 12 00:32:01 2010	(r22844)
@@ -339,7 +339,7 @@ static double get_qscale(MpegEncContext 
         0
     };
 
-    bits= ff_parse_eval(rcc->rc_eq_eval, const_values, rce);
+    bits= ff_eval_expr(rcc->rc_eq_eval, const_values, rce);
     if (isnan(bits)) {
         av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\"\n", s->avctx->rc_eq);
         return -1;