[FFmpeg-cvslog] Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 28 13:36:46 2013 +0200| [8ff23f0e3c9a6665c34c45b5635c2c149d30b264] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ff23f0e3c9a6665c34c45b5635c2c149d30b264
---