virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

const

Browse Source 
Originally committed as revision 11840 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-02-03 23:25:35 +00:00
parent 652a5bf69d
commit 20e4beaef7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/eval.c
View File

@ -55,7 +55,7 @@ typedef struct Parser{
double (**func2)(void *, double a, double b); // NULL terminated double (**func2)(void *, double a, double b); // NULL terminated
char **func2_name; // NULL terminated char **func2_name; // NULL terminated
void *opaque; void *opaque;
char **error; const char **error;
#define VARS 10 #define VARS 10
double var[VARS]; double var[VARS];
} Parser; } Parser;
@ -379,7 +379,7 @@ static int verify_expr(AVEvalExpr * e) {
AVEvalExpr * ff_parse(char *s, const char **const_name, AVEvalExpr * ff_parse(char *s, const char **const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name, double (**func2)(void *, double, double), char **func2_name,
char **error){ const char **error){
Parser p; Parser p;
AVEvalExpr * e; AVEvalExpr * e;
char w[strlen(s) + 1], * wp = w; char w[strlen(s) + 1], * wp = w;
@ -416,7 +416,7 @@ double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque) {
double ff_eval2(char *s, double *const_value, const char **const_name, double ff_eval2(char *s, double *const_value, const char **const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name, double (**func2)(void *, double, double), char **func2_name,
void *opaque, char **error){ void *opaque, const char **error){
AVEvalExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error); AVEvalExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error);
double d; double d;
if (!e) return NAN; if (!e) return NAN;
@ -430,7 +430,7 @@ attribute_deprecated double ff_eval(char *s, double *const_value, const char **c
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name, double (**func2)(void *, double, double), char **func2_name,
void *opaque){ void *opaque){
char *error=NULL; const char *error=NULL;
double ret; double ret;
ret = ff_eval2(s, const_value, const_name, func1, func1_name, func2, func2_name, opaque, &error); ret = ff_eval2(s, const_value, const_name, func1, func1_name, func2, func2_name, opaque, &error);
if (error) if (error)

4
libavcodec/eval.h
View File

@ -55,7 +55,7 @@ double ff_eval(char *s, double *const_value, const char **const_name,
double ff_eval2(char *s, double *const_value, const char **const_name, double ff_eval2(char *s, double *const_value, const char **const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name, double (**func2)(void *, double, double), char **func2_name,
void *opaque, char **error); void *opaque, const char **error);
typedef struct ff_expr_s AVEvalExpr; typedef struct ff_expr_s AVEvalExpr;
@ -74,7 +74,7 @@ typedef struct ff_expr_s AVEvalExpr;
AVEvalExpr * ff_parse(char *s, const char **const_name, AVEvalExpr * ff_parse(char *s, const char **const_name,
double (**func1)(void *, double), const char **func1_name, double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name, double (**func2)(void *, double, double), char **func2_name,
char **error); const char **error);
/** /**
* Evaluates a previously parsed expression. * Evaluates a previously parsed expression.
* @param const_value a zero terminated array of values for the identifers from ff_parse const_name * @param const_value a zero terminated array of values for the identifers from ff_parse const_name