Merge commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 11:24:43 +0000 (12:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 11:31:33 +0000 (12:31 +0100)
* commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54':
  arm: fft_vfp: Add a missing "endconst" when building in thumb mode

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

Simple merge