[FFmpeg-cvslog] Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 26 20:40:34 2014 +0200| [7206221d563e6d1d6bf2d5acd3b1378d77c7b7e4] | committer: Michael Niedermayer

Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'

* commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44':
  os_support: Adjust an outdated #endif comment

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

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