Merge commit '59cee42d7d22530e66a155305389e29679b11f78'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 23:04:46 +0000 (20:04 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 23:04:46 +0000 (20:04 -0300)
* commit '59cee42d7d22530e66a155305389e29679b11f78':
  arm: Check for the .arch directive in configure

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure
libavutil/arm/asm.S

diff --cc configure
Simple merge
Simple merge