[FFmpeg-cvslog] Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 23:47:09 2014 +0200| [77273456137f1799e6eb2066a4d767b553568aba] | committer: Michael Niedermayer

Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'

* commit '08b94f160a2c966bb83e32bde0e52246fafa2155':
  configure: Don't pass MSVC compiler options -M[TD] to armasm

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

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