Mercurial > libavcodec.hg
changeset 8320:0de488aa4fb0 libavcodec
Add a few const qualifiers in appropriate places.
patch by Anders Grnberg, galileo.m2 gmail com
| author | diego |
|---|---|
| date | Sun, 14 Dec 2008 12:24:50 +0000 |
| parents | 3e7dd8cfa97f |
| children | e9db9859de6c |
| files | eval.c eval.h h264.c |
| diffstat | 3 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/eval.c Sun Dec 14 03:41:11 2008 +0000 +++ b/eval.c Sun Dec 14 12:24:50 2008 +0000 @@ -47,12 +47,12 @@ typedef struct Parser{ int stack_index; char *s; - double *const_value; - const char **const_name; // NULL terminated + const double *const_value; + const char * const *const_name; // NULL terminated double (**func1)(void *, double a); // NULL terminated const char **func1_name; // NULL terminated double (**func2)(void *, double a, double b); // NULL terminated - char **func2_name; // NULL terminated + const char **func2_name; // NULL terminated void *opaque; const char **error; #define VARS 10 @@ -375,9 +375,9 @@ } } -AVEvalExpr * ff_parse(const char *s, const char **const_name, +AVEvalExpr * ff_parse(const char *s, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), char **func2_name, + double (**func2)(void *, double, double), const char **func2_name, const char **error){ Parser p; AVEvalExpr * e; @@ -404,7 +404,7 @@ return e; } -double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque) { +double ff_parse_eval(AVEvalExpr * e, const double *const_value, void *opaque) { Parser p; p.const_value= const_value; @@ -412,9 +412,9 @@ return eval_expr(&p, e); } -double ff_eval2(const char *s, double *const_value, const char **const_name, +double ff_eval2(const char *s, const double *const_value, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), char **func2_name, + double (**func2)(void *, double, double), const char **func2_name, void *opaque, const char **error){ AVEvalExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error); double d;
--- a/eval.h Sun Dec 14 03:41:11 2008 +0000 +++ b/eval.h Sun Dec 14 12:24:50 2008 +0000 @@ -42,9 +42,9 @@ * @param opaque a pointer which will be passed to all functions from func1 and func2 * @return the value of the expression */ -double ff_eval2(const char *s, double *const_value, const char **const_name, +double ff_eval2(const char *s, const double *const_value, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), char **func2_name, + double (**func2)(void *, double, double), const char **func2_name, void *opaque, const char **error); typedef struct ff_expr_s AVEvalExpr; @@ -61,9 +61,9 @@ * @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(const char *s, const char **const_name, +AVEvalExpr * ff_parse(const char *s, const char * const *const_name, double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), char **func2_name, + double (**func2)(void *, double, double), const char **func2_name, const char **error); /** * Evaluates a previously parsed expression. @@ -71,7 +71,7 @@ * @param opaque a pointer which will be passed to all functions from func1 and func2 * @return the value of the expression */ -double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque); +double ff_parse_eval(AVEvalExpr * e, const double *const_value, void *opaque); void ff_eval_free(AVEvalExpr * e); #endif /* AVCODEC_EVAL_H */
--- a/h264.c Sun Dec 14 03:41:11 2008 +0000 +++ b/h264.c Sun Dec 14 12:24:50 2008 +0000 @@ -106,7 +106,7 @@ const int mb_xy= h->mb_xy; int topleft_xy, top_xy, topright_xy, left_xy[2]; int topleft_type, top_type, topright_type, left_type[2]; - int * left_block; + const int * left_block; int topleft_partition= -1; int i;