diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-11 22:32:04 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-11 22:32:04 +0000 |
| commit | a367be1e88152458cdd3b31eb9a0bd06c9eb881b (patch) | |
| tree | b607f651c9655804ab07a7cf936ca80d00f405b1 | |
| parent | 4565caf120b04884e5b13f4e452f280b8d10f3f6 (diff) | |
| download | ffmpeg-a367be1e88152458cdd3b31eb9a0bd06c9eb881b.tar.gz | |
Rename ff_eval2() to ff_parse_and_eval_expr().
The new name better expresses what the function does.
Originally committed as revision 22845 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/eval.c | 10 | ||||
| -rw-r--r-- | libavcodec/eval.h | 2 | ||||
| -rw-r--r-- | libavcodec/opt.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/eval.c b/libavcodec/eval.c index ac25e9a5a1..c1cd7a416f 100644 --- a/libavcodec/eval.c +++ b/libavcodec/eval.c @@ -418,7 +418,7 @@ double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque) { return eval_expr(&p, e); } -double ff_eval2(const char *s, const double *const_value, const char * const *const_name, +double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), const char **func2_name, void *opaque, const char **error){ @@ -444,13 +444,13 @@ static const char *const_names[]={ }; int main(void){ int i; - printf("%f == 12.7\n", ff_eval2("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL)); - printf("%f == 0.931322575\n", ff_eval2("80G/80Gi", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL)); + printf("%f == 12.7\n", ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL)); + printf("%f == 0.931322575\n", ff_parse_and_eval_expr("80G/80Gi", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL)); for(i=0; i<1050; i++){ START_TIMER - ff_eval2("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL); - STOP_TIMER("ff_eval2") + ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL); + STOP_TIMER("ff_parse_and_eval_expr") } return 0; } diff --git a/libavcodec/eval.h b/libavcodec/eval.h index 6551b44a71..41bcd8c133 100644 --- a/libavcodec/eval.h +++ b/libavcodec/eval.h @@ -43,7 +43,7 @@ typedef struct AVExpr AVExpr; * @param opaque a pointer which will be passed to all functions from func1 and func2 * @return the value of the expression */ -double ff_eval2(const char *s, const double *const_value, const char * const *const_name, +double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), const char **func2_name, void *opaque, const char **error); diff --git a/libavcodec/opt.c b/libavcodec/opt.c index 04629b6a2f..e22ecf2880 100644 --- a/libavcodec/opt.c +++ b/libavcodec/opt.c @@ -156,7 +156,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons buf[i]= val[i]; buf[i]=0; - d = ff_eval2(buf, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error); + d = ff_parse_and_eval_expr(buf, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error); if(isnan(d)) { const AVOption *o_named= av_find_opt(obj, buf, o->unit, 0, 0); if(o_named && o_named->type == FF_OPT_TYPE_CONST) |