Mercurial > libavcodec.hg
comparison eval.c @ 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 |
comparison
equal
deleted
inserted
replaced
| 11613:2c41284050cf | 11614:ab7aceed5286 |
|---|---|
| 367 case e_gauss: return verify_expr(e->param[0]); | 367 case e_gauss: return verify_expr(e->param[0]); |
| 368 default: return verify_expr(e->param[0]) && verify_expr(e->param[1]); | 368 default: return verify_expr(e->param[0]) && verify_expr(e->param[1]); |
| 369 } | 369 } |
| 370 } | 370 } |
| 371 | 371 |
| 372 AVExpr * ff_parse(const char *s, const char * const *const_name, | 372 AVExpr *ff_parse_expr(const char *s, const char * const *const_name, |
| 373 double (**func1)(void *, double), const char **func1_name, | 373 double (**func1)(void *, double), const char **func1_name, |
| 374 double (**func2)(void *, double, double), const char **func2_name, | 374 double (**func2)(void *, double, double), const char **func2_name, |
| 375 const char **error){ | 375 const char **error){ |
| 376 Parser p; | 376 Parser p; |
| 377 AVExpr *e = NULL; | 377 AVExpr *e = NULL; |
| 414 | 414 |
| 415 double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, | 415 double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, |
| 416 double (**func1)(void *, double), const char **func1_name, | 416 double (**func1)(void *, double), const char **func1_name, |
| 417 double (**func2)(void *, double, double), const char **func2_name, | 417 double (**func2)(void *, double, double), const char **func2_name, |
| 418 void *opaque, const char **error){ | 418 void *opaque, const char **error){ |
| 419 AVExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error); | 419 AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error); |
| 420 double d; | 420 double d; |
| 421 if (!e) return NAN; | 421 if (!e) return NAN; |
| 422 d = ff_eval_expr(e, const_value, opaque); | 422 d = ff_eval_expr(e, const_value, opaque); |
| 423 ff_free_expr(e); | 423 ff_free_expr(e); |
| 424 return d; | 424 return d; |