Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:36:46 +0000 (13:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:37:46 +0000 (13:37 +0200)
commit8ff23f0e3c9a6665c34c45b5635c2c149d30b264
treed7a2d37d3122d1f7886ed8cb27639791870cb197
parent2655c1ac1282bbcfd7666e42aaf73014598faad5
parent5b097399baa2e38cc513939cfab3a9b6fdbc33df
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>
libavutil/eval.c