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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 25 21:42:56 2013 +0200| [ee5964cc9c8c8167c1998482fe639263c6783e9a] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  msvc/icl: Intel Compiler support on Windows

Conflicts:
	configure

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

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