diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-02-15 12:04:35 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2008-02-15 12:04:35 +0000 |
| commit | 6881b8e5671248e41582faac149bdf6abd0501e2 (patch) | |
| tree | a009b533fca618ad9db44f0307fab85a86f4ec36 /libavcodec | |
| parent | 408ed51cdb6c3e7e9d1ef0141b3c4e1c49121489 (diff) | |
Fix
utils.c: In function ‘avcodec_get_context_defaults2’:
utils.c:793: warning: assignment discards qualifiers from pointer target type
Originally committed as revision 11938 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/eval.c | 4 | ||||
| -rw-r--r-- | libavcodec/eval.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index feac22d5b0..524be49270 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 b75263b804..dc0012bf67 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 143c8765c7..786e950c01 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); |