diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/eval.h')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/eval.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/contrib/ffmpeg/libavcodec/eval.h b/contrib/ffmpeg/libavcodec/eval.h index b52199cf4..786e950c0 100644 --- a/contrib/ffmpeg/libavcodec/eval.h +++ b/contrib/ffmpeg/libavcodec/eval.h @@ -25,10 +25,13 @@ * eval header. */ -#ifndef AVCODEC_EVAL_H -#define AVCODEC_EVAL_H +#ifndef FFMPEG_EVAL_H +#define FFMPEG_EVAL_H #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) +/** + * @deprecated Use ff_eval2 instead + */ double ff_eval(char *s, double *const_value, const char **const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), char **func2_name, @@ -49,10 +52,10 @@ double ff_eval(char *s, double *const_value, const char **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_eval2(char *s, double *const_value, const char **const_name, +double ff_eval2(const char *s, double *const_value, const char **const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), char **func2_name, - void *opaque, char **error); + void *opaque, const char **error); typedef struct ff_expr_s AVEvalExpr; @@ -65,13 +68,13 @@ typedef struct ff_expr_s AVEvalExpr; * @param func1_name NULL terminated array of zero terminated strings of func1 identifers * @param func2_name NULL terminated array of zero terminated strings of func2 identifers * @param error pointer to a char* which is set to an error message if something goes wrong - * @return AVEvalExpr which must be freed with ff_eval_free by the user when its not needed anymore + * @return AVEvalExpr which must be freed with ff_eval_free by the user when it is not needed anymore * NULL if anything went wrong */ -AVEvalExpr * ff_parse(char *s, const char **const_name, +AVEvalExpr * ff_parse(const char *s, const char **const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), char **func2_name, - char **error); + const char **error); /** * Evaluates a previously parsed expression. * @param const_value a zero terminated array of values for the identifers from ff_parse const_name @@ -81,4 +84,4 @@ AVEvalExpr * ff_parse(char *s, const char **const_name, double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque); void ff_eval_free(AVEvalExpr * e); -#endif /* AVCODEC_EVAL_H */ +#endif /* FFMPEG_EVAL_H */ |