Merge commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 11:31:54 +0000 (12:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 11:42:47 +0000 (12:42 +0100)
* commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0':
  arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb

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

Simple merge