Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

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

Conflicts:
	doc/platform.texi

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

diff --cc doc/platform.texi
index 0703000,2a7dd45..6d01e0e
--- 1/doc/platform.texi
--- 2/doc/platform.texi
+++ b/doc/platform.texi
@@@ -106,10 -101,10 +106,10 @@@ libavformat) as DLLs
  
  @end itemize
  
- @section Microsoft Visual C++
+ @section Microsoft Visual C++ or Intel C++ Compiler for Windows
  
- FFmpeg can be built with MSVC using a C99-to-C89 conversion utility and
- wrapper.
 -Libav can be built with MSVC or ICL using a C99-to-C89 conversion utility and
++FFmpeg can be built with MSVC or ICL using a C99-to-C89 conversion utility and
+ wrapper. For ICL, only the wrapper is used, since ICL supports C99.
  
  You will need the following prerequisites:
  
@@@ -173,7 -173,12 +178,12 @@@ erroneously included when building FFmp
  can see.
  @end enumerate
  
- @item FFmpeg has been tested with Visual Studio 2010 and 2012, Pro and Express.
 -@item Libav has been tested with the following on i686 and x86_64:
++@item FFmpeg has been tested with the following on i686 and x86_64:
+ @itemize
+ @item Visual Studio 2010 Pro and Express
+ @item Visual Studio 2012 Pro and Express
+ @item Intel Composer XE 2013
+ @end itemize
  Anything else is not officially supported.
  
  @end itemize