]> git.sesse.net Git - ffmpeg/commit
Merge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 11:00:03 +0000 (13:00 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 11:00:09 +0000 (13:00 +0200)
commitd9f3efd3d611c83a0ceb2f05dc97e9feafc57575
tree4f2d638a204c638c1a358fcc1bc5cbf1490362e4
parenta74e3fc18b569693e7e046089b283576eae33a22
parent2192ff84dd720968108bc1ca54e239f4c94eb61d
Merge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'

* commit '2192ff84dd720968108bc1ca54e239f4c94eb61d':
  configure: Default to armasm for --toolchain=msvc when targeting arm

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
configure