diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-08 04:38:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-08 04:38:17 +0200 |
| commit | 13397025400b8e61af6ef5245c87b3cb32a436eb (patch) | |
| tree | c76b62745e98604214e5e89e30114db8bbb40073 | |
| parent | 9e5e086b7e67ba3a7d5842611855ce53a1fa7a54 (diff) | |
| download | ffmpeg-13397025400b8e61af6ef5245c87b3cb32a436eb.tar.gz | |
eval: add gcd()
example: -vf 'scale=256:256,mp=geq=gcd(X\,Y)-2:128:128'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/eval.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c index 733514d8e4..09bac3fdea 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -126,7 +126,7 @@ struct AVExpr { e_mod, e_max, e_min, e_eq, e_gt, e_gte, e_pow, e_mul, e_div, e_add, e_last, e_st, e_while, e_floor, e_ceil, e_trunc, - e_sqrt, e_not, e_random, e_hypot, + e_sqrt, e_not, e_random, e_hypot, e_gcd, } type; double value; // is sign in other types union { @@ -174,6 +174,7 @@ static double eval_expr(Parser *p, AVExpr *e) double d2 = eval_expr(p, e->param[1]); switch (e->type) { case e_mod: return e->value * (d - floor(d/d2)*d2); + case e_gcd: return e->value * av_gcd(d,d2); case e_max: return e->value * (d > d2 ? d : d2); case e_min: return e->value * (d < d2 ? d : d2); case e_eq: return e->value * (d == d2 ? 1.0 : 0.0); @@ -304,6 +305,7 @@ static int parse_primary(AVExpr **e, Parser *p) else if (strmatch(next, "pow" )) d->type = e_pow; else if (strmatch(next, "random")) d->type = e_random; else if (strmatch(next, "hypot" )) d->type = e_hypot; + else if (strmatch(next, "gcd" )) d->type = e_gcd; else { for (i=0; p->func1_names && p->func1_names[i]; i++) { if (strmatch(next, p->func1_names[i])) { |