Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'

[ffmpeg] / libavcodec / fft_init_table.c

diff --git a/libavcodec/fft_init_table.c b/libavcodec/fft_init_table.c
index 7511dbecd9df3f244b0864ad034c146b94d7139d..4d74f8a2a275b3e97ec5ad47517b7da9859882ed 100644 (file)
--- a/libavcodec/fft_init_table.c
+++ b/libavcodec/fft_init_table.c
@@ -53,7 +53,7 @@
  */
 #include "libavcodec/fft_table.h"
 
-int32_t w_tab_sr[MAX_FFT_SIZE/(4*16)] = {
+const int32_t ff_w_tab_sr[MAX_FFT_SIZE/(4*16)] = {
     2147483647, 2147481121, 2147473542, 2147460908, 2147443222, 2147420483, 2147392690, 2147359845,
     2147321946, 2147278995, 2147230991, 2147177934, 2147119825, 2147056664, 2146988450, 2146915184,
     2146836866, 2146753497, 2146665076, 2146571603, 2146473080, 2146369505, 2146260881, 2146147205,
@@ -184,7 +184,7 @@ int32_t w_tab_sr[MAX_FFT_SIZE/(4*16)] = {
       26352928,   23058947,   19764913,   16470832,   13176712,    9882561,    6588387,    3294197
 };
 
-uint16_t fft_offsets_lut[0x2aab];
+uint16_t ff_fft_offsets_lut[0x2aab];
 
 void ff_fft_lut_init(uint16_t *table, int off, int size, int *index)
 {