Mercurial > libavcodec.hg
changeset 6354:0809b40d9b65 libavcodec
Fix
utils.c: In function ¡Æavcodec_get_context_defaults2¡Ç:
utils.c:793: warning: assignment discards qualifiers from pointer target type
| author | lucabe |
|---|---|
| date | Fri, 15 Feb 2008 12:04:35 +0000 |
| parents | 42a3c36e3303 |
| children | 5a2c7290ddd3 |
| files | avcodec.h eval.c eval.h |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Fri Feb 15 11:38:38 2008 +0000 +++ b/avcodec.h Fri Feb 15 12:04:35 2008 +0000 @@ -1197,7 +1197,7 @@ * - encoding: Set by user * - decoding: unused */ - char *rc_eq; + const char *rc_eq; /** * maximum bitrate
--- a/eval.c Fri Feb 15 11:38:38 2008 +0000 +++ b/eval.c Fri Feb 15 12:04:35 2008 +0000 @@ -376,7 +376,7 @@ } } -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 @@ 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){
--- a/eval.h Fri Feb 15 11:38:38 2008 +0000 +++ b/eval.h Fri Feb 15 12:04:35 2008 +0000 @@ -52,7 +52,7 @@ * @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 @@ * @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);