[FFmpeg-cvslog] Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 18:54:11 2014 +0200| [f51c3e3a84e6b6fa5d6c2c26387a5bb8fb5580da] | committer: Michael Niedermayer

Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91'

* commit 'f4312352fc52cc47c1ba398a33f629d32a737e91':
  configure: Add probe identification of MS armasm

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

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