Mercurial > libavcodec.hg
changeset 11614:ab7aceed5286 libavcodec
Rename ff_parse() to ff_parse_expr().
The new name is more expressive and fits better in the overall naming
scheme for the revisited eval API.
| author | stefano |
|---|---|
| date | Mon, 12 Apr 2010 19:21:15 +0000 |
| parents | 2c41284050cf |
| children | 17ce5438a9c9 |
| files | eval.c eval.h ratecontrol.c |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/eval.c Mon Apr 12 19:21:08 2010 +0000 +++ b/eval.c Mon Apr 12 19:21:15 2010 +0000 @@ -369,7 +369,7 @@ } } -AVExpr * ff_parse(const char *s, const char * const *const_name, +AVExpr *ff_parse_expr(const char *s, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), const char **func2_name, const char **error){ @@ -416,7 +416,7 @@ double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), const char **func2_name, void *opaque, const char **error){ - AVExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error); + AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error); double d; if (!e) return NAN; d = ff_eval_expr(e, const_value, opaque);
--- a/eval.h Mon Apr 12 19:21:08 2010 +0000 +++ b/eval.h Mon Apr 12 19:21:15 2010 +0000 @@ -61,7 +61,7 @@ * @return AVExpr which must be freed with ff_free_expr() by the user when it is not needed anymore * NULL if anything went wrong */ -AVExpr * ff_parse(const char *s, const char * const *const_name, +AVExpr *ff_parse_expr(const char *s, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), const char **func2_name, const char **error);
--- a/ratecontrol.c Mon Apr 12 19:21:08 2010 +0000 +++ b/ratecontrol.c Mon Apr 12 19:21:15 2010 +0000 @@ -107,7 +107,7 @@ }; emms_c(); - rcc->rc_eq_eval = ff_parse(s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1, func1_names, NULL, NULL, &error); + rcc->rc_eq_eval = ff_parse_expr(s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1, func1_names, NULL, NULL, &error); if (!rcc->rc_eq_eval) { av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\": %s\n", s->avctx->rc_eq, error? error : ""); return -1;