[FFmpeg-cvslog] Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  3 01:20:24 2015 +0200| [02b5af7744059aecd580e5d7be60964695bd5a75] | committer: Michael Niedermayer

Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'

* commit '863ee06809b215895ee20cbc557eeceb904cf770':
  configure: Use the right local variable in the MSVC and ICL probes

Conflicts:
	configure

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

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