Merge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 00:42:55 +0000 (02:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 01:12:02 +0000 (03:12 +0200)
commitc27adb37ef5bf0280d16e8a2c4df29452a290982
tree4b3edd5c33bd4e30a459fd7863be0123104cc67e
parent4c735ee0e3d44e7c8e51c8dd519b14ac0f002bec
parent87552d54d3337c3241e8a9e1a05df16eaa821496
Merge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'

* commit '87552d54d3337c3241e8a9e1a05df16eaa821496':
  armv6: Accelerate ff_fft_calc for general case (nbits != 4)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/fft_init_arm.c
libavcodec/arm/fft_vfp.S