Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / atrac.c

diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c
index e398cee7b87a55827d9e89a5285892aecbb6ff25..6c1b1f19ce86caad833424688e1916500926c953 100644 (file)
--- a/libavcodec/atrac.c
+++ b/libavcodec/atrac.c
@@ -32,8 +32,8 @@
 #include "dsputil.h"
 #include "atrac.h"
 
-float sf_table[64];
-float qmf_window[48];
+float ff_atrac_sf_table[64];
+static float qmf_window[48];
 
 static const float qmf_48tap_half[24] = {
    -0.00001461907, -0.00009205479,-0.000056157569,0.00030117269,
@@ -54,9 +54,9 @@ void atrac_generate_tables(void)
     float s;
 
     /* Generate scale factors */
-    if (!sf_table[63])
+    if (!ff_atrac_sf_table[63])
         for (i=0 ; i<64 ; i++)
-            sf_table[i] = pow(2.0, (i - 15) / 3.0);
+            ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0);
 
     /* Generate the QMF window. */
     if (!qmf_window[47])