ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun May 3 16:14:55 2015 +0200| [52835cb8e16cd54bd4b3052279f184882cbf54c2] | committer: Michael Niedermayer
avutil/opt: Avoid division by 0 Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52835cb8e16cd54bd4b3052279f184882cbf54c2 --- libavutil/opt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 092446b..62db1b5 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -85,8 +85,9 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int { if (o->type != AV_OPT_TYPE_FLAGS && (o->max * den < num * intnum || o->min * den > num * intnum)) { + num = den ? num*intnum/den : (num*intnum ? INFINITY : NAN); av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n", - num*intnum/den, o->name, o->min, o->max); + num, o->name, o->min, o->max); return AVERROR(ERANGE); } if (o->type == AV_OPT_TYPE_FLAGS) { _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
