diff eval.h @ 11616:1461e6044153 libavcodec

Fix constness for func[12] parameters in ff_parse_expr() and ff_parse_and_eval_expr(). Change func[12] attributes from "** func" to "* const * func". This is consistent with the semantics of the provided arrays of functions, which are not supposed to be changed by the ff_parse_* functions. Also fix the GCC compilation warnings: libavcodec/ratecontrol.c: In function ?ff_rate_control_init?: libavcodec/ratecontrol.c:109: warning: passing argument 3 of ?ff_parse_expr? discards qualifiers from pointer target type libavcodec/eval.h:69: note: expected ?double (**)(void *, double)? but argument is of type ?double (* const*)(void *, double)?

--- a/eval.h	Mon Apr 12 19:21:19 2010 +0000
+++ b/eval.h	Mon Apr 12 20:22:55 2010 +0000
@@ -44,8 +44,8 @@
  * @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 @@
  * @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);
 
 /**