[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  2 18:37:14 2013 +0100| [67d1d06225e91ec80506f5c568c13899531bb873] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  os_support: Add #endif comments for better readability

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

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