virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

eval: support 3 parameter functions.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-02-22 17:19:35 +01:00
parent 43b1943a55
commit 094673ff1b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavutil/eval.c
View File

@@ -145,7 +145,7 @@ struct AVExpr {
double (*func1)(void *, double); double (*func1)(void *, double);
double (*func2)(void *, double, double); double (*func2)(void *, double, double);
} a; } a;
struct AVExpr *param[2]; struct AVExpr *param[3];
double *var; double *var;
}; };
@@ -229,6 +229,7 @@ void av_expr_free(AVExpr *e)
if (!e) return; if (!e) return;
av_expr_free(e->param[0]); av_expr_free(e->param[0]);
av_expr_free(e->param[1]); av_expr_free(e->param[1]);
av_expr_free(e->param[2]);
av_freep(&e->var); av_freep(&e->var);
av_freep(&e); av_freep(&e);
} }
@@ -301,6 +302,10 @@ static int parse_primary(AVExpr **e, Parser *p)
p->s++; // "," p->s++; // ","
parse_expr(&d->param[1], p); parse_expr(&d->param[1], p);
} }
if (p->s[0]== ',') {
p->s++; // ","
parse_expr(&d->param[2], p);
}
if (p->s[0] != ')') { if (p->s[0] != ')') {
av_log(p, AV_LOG_ERROR, "Missing ')' or too many args in '%s'\n", s0); av_log(p, AV_LOG_ERROR, "Missing ')' or too many args in '%s'\n", s0);
av_expr_free(d); av_expr_free(d);
@@ -517,8 +522,8 @@ static int verify_expr(AVExpr *e)
case e_sqrt: case e_sqrt:
case e_not: case e_not:
case e_random: case e_random:
return verify_expr(e->param[0]); return verify_expr(e->param[0]) && !e->param[2];
default: return verify_expr(e->param[0]) && verify_expr(e->param[1]); default: return verify_expr(e->param[0]) && verify_expr(e->param[1]) && !e->param[2];
} }
} }