Commit 4565caf1 authored by Stefano Sabatini's avatar Stefano Sabatini

Rename ff_parse_eval() to ff_eval_expr().

The new name expresses better what the function does.

Originally committed as revision 22844 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9a2cb05f
...@@ -410,7 +410,7 @@ end: ...@@ -410,7 +410,7 @@ end:
return e; 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; Parser p;
p.const_value= const_value; p.const_value= const_value;
...@@ -425,7 +425,7 @@ double ff_eval2(const char *s, const double *const_value, const char * const *co ...@@ -425,7 +425,7 @@ double ff_eval2(const char *s, const double *const_value, const char * const *co
AVExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error); AVExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error);
double d; double d;
if (!e) return NAN; if (!e) return NAN;
d = ff_parse_eval(e, const_value, opaque); d = ff_eval_expr(e, const_value, opaque);
ff_free_expr(e); ff_free_expr(e);
return d; return d;
} }
......
...@@ -30,7 +30,7 @@ typedef struct AVExpr AVExpr; ...@@ -30,7 +30,7 @@ typedef struct AVExpr AVExpr;
/** /**
* Parses and evaluates an expression. * 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 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 * @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 char * const *const_name, ...@@ -73,7 +73,7 @@ AVExpr * ff_parse(const char *s, const char * const *const_name,
* @param opaque a pointer which will be passed to all functions from func1 and func2 * @param opaque a pointer which will be passed to all functions from func1 and func2
* @return the value of the expression * @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(). * Frees a parsed expression previously created with ff_parse().
......
...@@ -339,7 +339,7 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f ...@@ -339,7 +339,7 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f
0 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)) { if (isnan(bits)) {
av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\"\n", s->avctx->rc_eq); av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\"\n", s->avctx->rc_eq);
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment