[FFmpeg-cvslog] Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 16 21:34:03 2015 +0100| [b37852c7d9bc81dface8c8b4143301af914ef9a4] | committer: Michael Niedermayer

Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'

* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea':
  configure: handle Apple's armv7s in probe_arm_arch()

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

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