[FFmpeg-cvslog] Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 25 10:46:52 2013 +0200| [bad8f04b0454441edb0b7a1565e28c0b1a07f7ed] | committer: Michael Niedermayer

Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

* commit 'b0ce601c160c87349d093d7e542b5c752754f598':
  doc/platform: Add info about ICL

Conflicts:
	doc/platform.texi

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

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