[FFmpeg-cvslog] Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'
Michael Niedermayer
git at videolan.org
Mon Jul 27 13:32:17 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 27 13:20:12 2015 +0200| [d06ea6e5ce51165c7c81677ab6827612173bf4f7] | committer: Michael Niedermayer
Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'
* commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c':
configure: Check for _M_ARMT to detect thumb when using MSVC
Conflicts:
configure
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d06ea6e5ce51165c7c81677ab6827612173bf4f7
---
More information about the ffmpeg-cvslog
mailing list