[FFmpeg-cvslog] Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 22 03:06:43 2014 +0200| [135b1a3f2c7985b8336d170419aec6e30cd78043] | committer: Michael Niedermayer

Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

* commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d':
  configure: add support for neon intrinsics

Conflicts:
	configure

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

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