From 6881b8e5671248e41582faac149bdf6abd0501e2 Mon Sep 17 00:00:00 2001 From: Luca Abeni Date: Fri, 15 Feb 2008 12:04:35 +0000 Subject: [PATCH] =?utf8?q?Fix=20utils.c:=20In=20function=20=E2=80=98avcode?= =?utf8?q?c=5Fget=5Fcontext=5Fdefaults2=E2=80=99:=20utils.c:793:=20warning?= =?utf8?q?:=20assignment=20discards=20qualifiers=20from=20pointer=20target?= =?utf8?q?=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Originally committed as revision 11938 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 2 +- libavcodec/eval.c | 4 ++-- libavcodec/eval.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index feac22d..524be49 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1197,7 +1197,7 @@ typedef struct AVCodecContext { * - encoding: Set by user * - decoding: unused */ - char *rc_eq; + const char *rc_eq; /** * maximum bitrate diff --git a/libavcodec/eval.c b/libavcodec/eval.c index b75263b..dc0012b 100644 --- a/libavcodec/eval.c +++ b/libavcodec/eval.c @@ -376,7 +376,7 @@ static int verify_expr(AVEvalExpr * e) { } } -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, const char **error){ @@ -413,7 +413,7 @@ double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque) { return eval_expr(&p, e); } -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, const char **error){ diff --git a/libavcodec/eval.h b/libavcodec/eval.h index 143c876..786e950 100644 --- a/libavcodec/eval.h +++ b/libavcodec/eval.h @@ -52,7 +52,7 @@ 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, const char **error); @@ -71,7 +71,7 @@ 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, const char **error); -- 2.7.4