[FFmpeg-cvslog] Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 19:28:25 2014 +0200| [cd7ae5af16d7fc718a34effea3e3fef09a1a8a2e] | committer: Michael Niedermayer

Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'

* commit '82fc9f4b38244236a6ca7f946662ca653044a04c':
  display: Include mathematics.h for fallback definition of NAN

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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