[FFmpeg-devel] [PATCH 1/6] fft: add ff_ prefix to some global arrays.

[Reimar Döffinger]

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
---
 libavcodec/fft_init_table.c |  4 ++--
 libavcodec/fft_table.h      |  4 ++--
 libavcodec/fft_template.c   | 12 ++++++------
 libavcodec/mips/fft_mips.c  |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libavcodec/fft_init_table.c b/libavcodec/fft_init_table.c
index 4e8b082..4d74f8a 100644
--- a/libavcodec/fft_init_table.c
+++ b/libavcodec/fft_init_table.c
@@ -53,7 +53,7 @@
  */
 #include "libavcodec/fft_table.h"
 
-const 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 @@ const 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)
 {
diff --git a/libavcodec/fft_table.h b/libavcodec/fft_table.h
index 4cd3a45..e5e54b6 100644
--- a/libavcodec/fft_table.h
+++ b/libavcodec/fft_table.h
@@ -59,8 +59,8 @@
 #define MAX_LOG2_NFFT 16 //!< Specifies maximum allowed fft size
 #define MAX_FFT_SIZE (1 << MAX_LOG2_NFFT)
 
-extern const int32_t w_tab_sr[];
-extern uint16_t fft_offsets_lut[];
+extern const int32_t ff_w_tab_sr[];
+extern uint16_t ff_fft_offsets_lut[];
 void ff_fft_lut_init(uint16_t *table, int off, int size, int *index);
 
 #endif /* AVCODEC_FFT_TABLE_H */
diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c
index 697d1fc..3abf948 100644
--- a/libavcodec/fft_template.c
+++ b/libavcodec/fft_template.c
@@ -166,7 +166,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
 #if FFT_FIXED_32
     {
         int n=0;
-        ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n);
+        ff_fft_lut_init(ff_fft_offsets_lut, 0, 1 << 16, &n);
     }
 #else /* FFT_FIXED_32 */
 #if FFT_FLOAT
@@ -236,7 +236,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
     num_transforms = (0x2aab >> (16 - s->nbits)) | 1;
 
     for (n=0; n<num_transforms; n++){
-        offset = fft_offsets_lut[n] << 2;
+        offset = ff_fft_offsets_lut[n] << 2;
         tmpz = z + offset;
 
         tmp1 = tmpz[0].re + tmpz[1].re;
@@ -264,7 +264,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
     num_transforms = (num_transforms >> 1) | 1;
 
     for (n=0; n<num_transforms; n++){
-        offset = fft_offsets_lut[n] << 3;
+        offset = ff_fft_offsets_lut[n] << 3;
         tmpz = z + offset;
 
         tmp1 = tmpz[4].re + tmpz[5].re;
@@ -322,7 +322,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
         num_transforms = (num_transforms >> 1) | 1;
 
         for (n=0; n<num_transforms; n++){
-            offset = fft_offsets_lut[n] << nbits;
+            offset = ff_fft_offsets_lut[n] << nbits;
             tmpz = z + offset;
 
             tmp5 = tmpz[ n2].re + tmpz[n34].re;
@@ -339,8 +339,8 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
             tmpz[n34].im = tmpz[n4].im + tmp1;
             tmpz[ n4].im = tmpz[n4].im - tmp1;
 
-            w_re_ptr = w_tab_sr + step;
-            w_im_ptr = w_tab_sr + MAX_FFT_SIZE/(4*16) - step;
+            w_re_ptr = ff_w_tab_sr + step;
+            w_im_ptr = ff_w_tab_sr + MAX_FFT_SIZE/(4*16) - step;
 
             for (i=1; i<n4; i++){
                 w_re = w_re_ptr[0];
diff --git a/libavcodec/mips/fft_mips.c b/libavcodec/mips/fft_mips.c
index d240f1f..691f2db 100644
--- a/libavcodec/mips/fft_mips.c
+++ b/libavcodec/mips/fft_mips.c
@@ -87,7 +87,7 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z)
 
 
     for (n=0; n<num_transforms; n++) {
-        offset = fft_offsets_lut[n] << 2;
+        offset = ff_fft_offsets_lut[n] << 2;
         tmpz = z + offset;
 
         tmp1 = tmpz[0].re + tmpz[1].re;
@@ -116,7 +116,7 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z)
     num_transforms = (num_transforms >> 1) | 1;
 
     for (n=0; n<num_transforms; n++) {
-        offset = fft_offsets_lut[n] << 3;
+        offset = ff_fft_offsets_lut[n] << 3;
         tmpz = z + offset;
 
         __asm__ volatile (
@@ -227,7 +227,7 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z)
         n34 = 3 * n4;
 
         for (n=0; n<num_transforms; n++) {
-            offset = fft_offsets_lut[n] << nbits;
+            offset = ff_fft_offsets_lut[n] << nbits;
             tmpz = z + offset;
 
             tmpz_n2  = tmpz +  n2;
@@ -521,7 +521,7 @@ av_cold void ff_fft_init_mips(FFTContext *s)
 {
     int n=0;
 
-    ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n);
+    ff_fft_lut_init(ff_fft_offsets_lut, 0, 1 << 16, &n);
     ff_init_ff_cos_tabs(16);
 
 #if HAVE_INLINE_ASM
-- 
2.1.0