[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 11 03:07:31 2014 +0100| [9d5cc55f0fdf1f7b7dd729d7befb45923c0de181] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add an option for making sure NEON registers aren't clobbered

Conflicts:
	configure

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

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