Browse Source

Change constness for func[12]_name parameters of ff_parse_expr() and

ff_parse_and_eval_expr().

Change attribute from "const char **" to "const char * const *".
The name arrays are not supposed to be changed by the function.

Originally committed as revision 22859 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Stefano Sabatini 16 years ago
parent
commit
82fdcd449c
2 changed files with 10 additions and 10 deletions
  1. +6
    -6
      libavcodec/eval.c
  2. +4
    -4
      libavcodec/eval.h

+ 6
- 6
libavcodec/eval.c View File

@@ -35,9 +35,9 @@ typedef struct Parser{
const double *const_value;
const char * const *const_name; // NULL terminated
double (**func1)(void *, double a); // NULL terminated
const char **func1_name; // NULL terminated
const char * const *func1_name; // NULL terminated
double (**func2)(void *, double a, double b); // NULL terminated
const char **func2_name; // NULL terminated
const char * const *func2_name; // NULL terminated
void *opaque;
const char **error;
#define VARS 10
@@ -370,8 +370,8 @@ static int verify_expr(AVExpr * e) {
}

AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), const char **func2_name,
double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char * const *func2_name,
const char **error){
Parser p;
AVExpr *e = NULL;
@@ -413,8 +413,8 @@ double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque) {
}

double ff_parse_and_eval_expr(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), const char **func2_name,
double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char * const *func2_name,
void *opaque, const char **error){
AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error);
double d;


+ 4
- 4
libavcodec/eval.h View File

@@ -44,8 +44,8 @@ typedef struct AVExpr AVExpr;
* @return the value of the expression
*/
double ff_parse_and_eval_expr(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), const char **func2_name,
double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char * const *func2_name,
void *opaque, const char **error);

/**
@@ -62,8 +62,8 @@ double ff_parse_and_eval_expr(const char *s, const double *const_value, const ch
* NULL if anything went wrong
*/
AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), const char **func2_name,
double (**func1)(void *, double), const char * const *func1_name,
double (**func2)(void *, double, double), const char * const *func2_name,
const char **error);

/**


Loading…
Cancel
Save