Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / eval.c

diff --git a/libavutil/eval.c b/libavutil/eval.c
index b41c95c8386f80134dff1d96c015cbdd079b2d40..6687b646f5a9b15c3135833b36eca8e0f521f7b7 100644 (file)
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -253,7 +253,7 @@ static double eval_expr(Parser *p, AVExpr *e)
             double d = eval_expr(p, e->param[0]);
             double d2 = eval_expr(p, e->param[1]);
             switch (e->type) {
-                case e_mod: return e->value * (d - floor(d/d2)*d2);
+                case e_mod: return e->value * (d - floor((!CONFIG_FTRAPV || d2) ? d / d2 : d * INFINITY) * 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);