Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Jan 2014 02:07:31 +0000 (03:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Jan 2014 02:08:10 +0000 (03:08 +0100)
commit9d5cc55f0fdf1f7b7dd729d7befb45923c0de181
tree7dbc1cc698905b2bc6b8fea102e98850a6a4141f
parentb84a7330af41cec93384bf59ed68c67b09d105cd
parent44a0a98f92c7df1452029aa0295e0ece9d2165ca
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@gmx.at>
configure
libavcodec/arm/neontest.c
libavutil/arm/neontest.h