diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-11 22:32:01 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-11 22:32:01 +0000 |
| commit | 4565caf120b04884e5b13f4e452f280b8d10f3f6 (patch) | |
| tree | 72665cc4524ee265f384e1ff29a8cc798a267fac | |
| parent | 9a2cb05ff9281339c37feb8488e5d24d794672fb (diff) | |
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
| -rw-r--r-- | libavcodec/eval.c | 4 | ||||
| -rw-r--r-- | libavcodec/eval.h | 4 | ||||
| -rw-r--r-- | libavcodec/ratecontrol.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/eval.c b/libavcodec/eval.c index dae55c3392..ac25e9a5a1 100644 --- a/libavcodec/eval.c +++ b/libavcodec/eval.c @@ -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 double *const_value, const char * const *co 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; } diff --git a/libavcodec/eval.h b/libavcodec/eval.h index 47446f72ab..6551b44a71 100644 --- a/libavcodec/eval.h +++ b/libavcodec/eval.h @@ -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 char * const *const_name, * @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(). diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index f1f9c060a5..35191b0ed7 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -339,7 +339,7 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f 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; |