virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Rename ff_parse_eval() to ff_eval_expr().

Browse Source 
The new name expresses better what the function does.

Originally committed as revision 22844 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-04-11 22:32:01 +00:00
parent 9a2cb05ff9
commit 4565caf120
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/eval.c
View File

@ -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;
}

4
libavcodec/eval.h
View File

@ -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().

2
libavcodec/ratecontrol.c
View File

@ -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;