[FFmpeg-cvslog] Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 15:50:59 2013 +0200| [e1f74ad1f0102648e2db8e4fda788f47d38a94ad] | committer: Michael Niedermayer

Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'

* commit '09f2581dc5edb3642858d69d9a70b67e249167e9':
  msvc/icl: Use __declspec(deprecated)

Conflicts:
	configure

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

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