X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Feval.h;h=786e950c0132b0ce97e2dc0be47b7fe2a4366bfa;hb=892d226857f9276d94f7734b0cd9af9ac3385086;hp=0a1cd87f6d3f5f2af2eaa09c8655eabe35c61bb8;hpb=90b5b51eab008ddb24701bb95aa4c017e62bb111;p=ffmpeg

diff --git a/libavcodec/eval.h b/libavcodec/eval.h
index 0a1cd87f6d3..786e950c013 100644
--- a/libavcodec/eval.h
+++ b/libavcodec/eval.h
@@ -25,8 +25,8 @@
  * 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)
 /**
@@ -52,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;
 
@@ -71,10 +71,10 @@ typedef struct ff_expr_s AVEvalExpr;
  * @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
@@ -84,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 */