diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/eval.c | 12 | ||||
| -rw-r--r-- | libavcodec/eval.h | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/eval.c b/libavcodec/eval.c index 6cc597faaf..0b2aed9ddc 100644 --- a/libavcodec/eval.c +++ b/libavcodec/eval.c @@ -34,9 +34,9 @@ typedef struct Parser{ char *s; const double *const_value; const char * const *const_name; // NULL terminated - double (**func1)(void *, double a); // NULL terminated + double (* const *func1)(void *, double a); // NULL terminated const char * const *func1_name; // NULL terminated - double (**func2)(void *, double a, double b); // NULL terminated + double (* const *func2)(void *, double a, double b); // NULL terminated const char * const *func2_name; // NULL terminated void *opaque; const char **error; @@ -370,8 +370,8 @@ static int verify_expr(AVExpr * e) { } AVExpr *ff_parse_expr(const char *s, const char * const *const_name, - double (**func1)(void *, double), const char * const *func1_name, - double (**func2)(void *, double, double), const char * const *func2_name, + double (* const *func1)(void *, double), const char * const *func1_name, + double (* const *func2)(void *, double, double), const char * const *func2_name, const char **error){ Parser p; AVExpr *e = NULL; @@ -413,8 +413,8 @@ double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque) { } double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, - double (**func1)(void *, double), const char * const *func1_name, - double (**func2)(void *, double, double), const char * const *func2_name, + double (* const *func1)(void *, double), const char * const *func1_name, + double (* const *func2)(void *, double, double), const char * const *func2_name, void *opaque, const char **error){ AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error); double d; diff --git a/libavcodec/eval.h b/libavcodec/eval.h index 86d808c37e..9ba5571cd7 100644 --- a/libavcodec/eval.h +++ b/libavcodec/eval.h @@ -44,8 +44,8 @@ typedef struct AVExpr AVExpr; * @return the value of the expression */ double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name, - double (**func1)(void *, double), const char * const *func1_name, - double (**func2)(void *, double, double), const char * const *func2_name, + double (* const *func1)(void *, double), const char * const *func1_name, + double (* const *func2)(void *, double, double), const char * const *func2_name, void *opaque, const char **error); /** @@ -61,9 +61,10 @@ double ff_parse_and_eval_expr(const char *s, const double *const_value, const ch * @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_expr(const char *s, const char * const *const_name, - double (**func1)(void *, double), const char * const *func1_name, - double (**func2)(void *, double, double), const char * const *func2_name, + double (* const *func1)(void *, double), const char * const *func1_name, + double (* const *func2)(void *, double, double), const char * const *func2_name, const char **error); /** |