projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a141948
)
avutil/opt: Avoid division by 0
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 May 2015 14:14:55 +0000
(16:14 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 May 2015 14:37:04 +0000
(16:37 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/opt.c
patch
|
blob
|
history
diff --git
a/libavutil/opt.c
b/libavutil/opt.c
index
092446b
..
62db1b5
100644
(file)
--- 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) {