diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 12:24:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 12:31:33 +0100 |
commit | 8554a10992de7b756e555a9a2b90590490e1fad7 (patch) | |
tree | 39d365ac0505fbcdc8432808dba95030518b350f /libavcodec | |
parent | 5ab467043a2b4df10e2731d3ac9ba39039386228 (diff) | |
parent | ae81576414f2d2083d3118fb4abe1ebc5a7a4c54 (diff) | |
download | ffmpeg-streaming-8554a10992de7b756e555a9a2b90590490e1fad7.zip ffmpeg-streaming-8554a10992de7b756e555a9a2b90590490e1fad7.tar.gz |
Merge commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54'
* commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54':
arm: fft_vfp: Add a missing "endconst" when building in thumb mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/arm/fft_vfp.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/arm/fft_vfp.S b/libavcodec/arm/fft_vfp.S index 1abe45a..e1ab8f7 100644 --- a/libavcodec/arm/fft_vfp.S +++ b/libavcodec/arm/fft_vfp.S @@ -54,6 +54,7 @@ T const fft_tab_vfp .word fft32768_vfp .word fft65536_vfp A endfunc +T endconst function fft4_vfp vldr d0, [a1, #0*2*4] @ s0,s1 = z[0] |