aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/eval.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-02-03 23:25:35 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-02-03 23:25:35 +0000
commit20e4beaef73bb249c429a6af491c863fdff1df06 (patch)
treef5f73d4b88cc6fbc002212d4919fd4516a8f9a2e /libavcodec/eval.c
parent652a5bf69dfcc651c0f1e0d1ce30afc2d2253075 (diff)
downloadffmpeg-20e4beaef73bb249c429a6af491c863fdff1df06.tar.gz
const
Originally committed as revision 11840 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/eval.c')
-rw-r--r--libavcodec/eval.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index da4876375d..b75263b804 100644
--- a/libavcodec/eval.c
+++ b/libavcodec/eval.c
@@ -55,7 +55,7 @@ typedef struct Parser{
double (**func2)(void *, double a, double b); // NULL terminated
char **func2_name; // NULL terminated
void *opaque;
- char **error;
+ const char **error;
#define VARS 10
double var[VARS];
} Parser;
@@ -379,7 +379,7 @@ static int verify_expr(AVEvalExpr * e) {
AVEvalExpr * ff_parse(char *s, const char **const_name,
double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name,
- char **error){
+ const char **error){
Parser p;
AVEvalExpr * e;
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 (**func1)(void *, double), const char **func1_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);
double d;
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 (**func2)(void *, double, double), char **func2_name,
void *opaque){
- char *error=NULL;
+ const char *error=NULL;
double ret;
ret = ff_eval2(s, const_value, const_name, func1, func1_name, func2, func2_name, opaque, &error);
if (error)