[FFmpeg-cvslog] Merge commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  1 10:16:42 2013 +0200| [b919a8d3a38559bb5f60a66839ca6f3358b1c908] | committer: Michael Niedermayer

Merge commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28'

* commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28':
  configure: Separate commonalities in msvc and icl flags

Conflicts:
	configure

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

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