diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:36:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:37:46 +0200 |
| commit | 8ff23f0e3c9a6665c34c45b5635c2c149d30b264 (patch) | |
| tree | d7a2d37d3122d1f7886ed8cb27639791870cb197 /libavutil/eval.c | |
| parent | 2655c1ac1282bbcfd7666e42aaf73014598faad5 (diff) | |
| parent | 5b097399baa2e38cc513939cfab3a9b6fdbc33df (diff) | |
| download | ffmpeg-8ff23f0e3c9a6665c34c45b5635c2c149d30b264.tar.gz | |
Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'
* commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df':
eval: Explicitly ignore return value of strtod() in parse_db()
Conflicts:
libavutil/eval.c
See: 3cd9849d9c24b0808e6e55cd7568250acaae2b91
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/eval.c')
| -rw-r--r-- | libavutil/eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c index 9b1458c89b..635e538af5 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -27,6 +27,7 @@ */ #include <float.h> +#include "attributes.h" #include "avutil.h" #include "common.h" #include "eval.h" @@ -487,7 +488,7 @@ static int parse_dB(AVExpr **e, Parser *p, int *sign) for example, -3dB is not the same as -(3dB) */ if (*p->s == '-') { char *next; - double av_unused v = strtod(p->s, &next); + double av_unused ignored = strtod(p->s, &next); if (next != p->s && next[0] == 'd' && next[1] == 'B') { *sign = 0; return parse_primary(e, p); |