summaryrefslogtreecommitdiffstats
path: root/libavutil/eval.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-09 05:55:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-09 06:02:34 +0200
commit03f5043f5d13446f3a8af4a838a4e614190d2a51 (patch)
tree25ca247b7d78b5a2e02fdd01bf096e7982bdd095 /libavutil/eval.c
parente73bac484f71bbfe9444fbea2e31f00f72596861 (diff)
downloadffmpeg-streaming-03f5043f5d13446f3a8af4a838a4e614190d2a51.zip
ffmpeg-streaming-03f5043f5d13446f3a8af4a838a4e614190d2a51.tar.gz
eval: Fix eval test with ftrapv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/eval.c')
-rw-r--r--libavutil/eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c
index dc2fb45..931ad6b 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -258,7 +258,7 @@ static double eval_expr(Parser *p, AVExpr *e)
case e_gte: return e->value * (d >= d2 ? 1.0 : 0.0);
case e_pow: return e->value * pow(d, d2);
case e_mul: return e->value * (d * d2);
- case e_div: return e->value * (d / d2);
+ case e_div: return e->value * ((!CONFIG_FTRAPV || d2 ) ? (d / d2) : d * INFINITY);
case e_add: return e->value * (d + d2);
case e_last:return e->value * d2;
case e_st : return e->value * (p->var[av_clip(d, 0, VARS-1)]= d2);
OpenPOWER on IntegriCloud