dsputil: Move LOCAL_ALIGNED macros to libavutil

[ffmpeg] / libavcodec / atrac.c

diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c
index 1b8b88327ef53d4943f70ea5c317e2c8a80bc979..a772e7db48d22f799db5a34c8991f0fef4ef4bc0 100644 (file)
--- a/libavcodec/atrac.c
+++ b/libavcodec/atrac.c
@@ -3,37 +3,38 @@
  * Copyright (c) 2006-2008 Maxim Poliakovski
  * Copyright (c) 2006-2008 Benjamin Larsson
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file libavcodec/atrac.c
+ * @file
  */
 
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "avcodec.h"
 #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,
@@ -48,15 +49,15 @@ static const float qmf_48tap_half[24] = {
  * Generate common tables
  */
 
-void atrac_generate_tables(void)
+void ff_atrac_generate_tables(void)
 {
     int i;
     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])
@@ -79,7 +80,7 @@ void atrac_generate_tables(void)
  */
 
 
-void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)
+void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)
 {
     int   i, j;
     float   *p1, *p3;
@@ -117,4 +118,3 @@ void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float
     /* Update the delay buffer. */
     memcpy(delayBuf, temp + nIn*2, 46*sizeof(float));
 }
-