[FFmpeg-cvslog] Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 30 12:23:48 2015 +0200| [1919827f2c2bdf55264e3ed52cacf12b1289789f] | committer: Michael Niedermayer

Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'

* commit 'bf0cef5c3a114df452e5476167634dd8f51eb448':
  checkasm: Include io.h for isatty, if available

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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