ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/aactab.c

Index: patched-ffmpeg-mt/libavcodec/aactab.c
===================================================================
--- patched-ffmpeg-mt/libavcodec/aactab.c	(revision 41250)
+++ patched-ffmpeg-mt/libavcodec/aactab.c	(working copy)
@@ -409,7 +409,7 @@
  * 64.0f is a special value indicating the existence of an escape code in the
  * bitstream.
  */
-static const DECLARE_ALIGNED_16(float, codebook_vector0)[324] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector0)[324] = {
  -1.0000000, -1.0000000, -1.0000000, -1.0000000,
  -1.0000000, -1.0000000, -1.0000000,  0.0000000,
  -1.0000000, -1.0000000, -1.0000000,  1.0000000,
@@ -493,7 +493,7 @@
   1.0000000,  1.0000000,  1.0000000,  1.0000000,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector2)[324] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector2)[324] = {
   0.0000000,  0.0000000,  0.0000000,  0.0000000,
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  0.0000000,  0.0000000,  2.5198421,
@@ -577,7 +577,7 @@
   2.5198421,  2.5198421,  2.5198421,  2.5198421,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector4)[162] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector4)[162] = {
  -6.3496042, -6.3496042, -6.3496042, -4.3267487,
  -6.3496042, -2.5198421, -6.3496042, -1.0000000,
  -6.3496042,  0.0000000, -6.3496042,  1.0000000,
@@ -621,7 +621,7 @@
   6.3496042,  6.3496042,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector6)[128] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector6)[128] = {
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  2.5198421,  0.0000000,  4.3267487,
   0.0000000,  6.3496042,  0.0000000,  8.5498797,
@@ -656,7 +656,7 @@
  13.3905183, 10.9027236, 13.3905183, 13.3905183,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector8)[338] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector8)[338] = {
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  2.5198421,  0.0000000,  4.3267487,
   0.0000000,  6.3496042,  0.0000000,  8.5498797,
@@ -744,7 +744,7 @@
  27.4731418, 27.4731418,
 };
 
-static const DECLARE_ALIGNED_16(float, codebook_vector10)[578] = {
+static const DECLARE_ALIGNED(16, float, codebook_vector10)[578] = {
   0.0000000,  0.0000000,  0.0000000,  1.0000000,
   0.0000000,  2.5198421,  0.0000000,  4.3267487,
   0.0000000,  6.3496042,  0.0000000,  8.5498797,
@@ -903,10 +903,6 @@
    -1.0000000,  0.0000000,  1.0000000
 };
 
-static const float codebook_vector2_vals[] = {
-    0.0000000,  1.0000000,  2.5198421,
-};
-
 /*
  * bits  0:1, 2:3, 4:5, 6:7  index into _vals array
  *       8:11                number of non-zero values
@@ -947,11 +943,6 @@
     0x0008, 0x0018, 0x0028, 0x0038, 0x0048, 0x0058, 0x0068, 0x0078, 0x0088,
 };
 
-static const float codebook_vector6_vals[] = {
-    0.0000000,  1.0000000,  2.5198421,  4.3267487,
-    6.3496042,  8.5498797, 10.9027236, 13.3905183,
-};
-
 /*
  * bits  0:3, 4:7  index into _vals array
  *       8:11      number of non-zero values
@@ -969,16 +960,6 @@
     0x1107, 0x0217, 0x0227, 0x0237, 0x0247, 0x0257, 0x0267, 0x0277,
 };
 
-static const float codebook_vector8_vals[] = {
-     0.0000000,  1.0000000,
-     2.5198421,  4.3267487,
-     6.3496042,  8.5498797,
-    10.9027236, 13.3905183,
-    16.0000000, 18.7207544,
-    21.5443469, 24.4637810,
-    27.4731418,
-};
-
 /*
  * bits  0:3, 4:7  index into _vals array
  *       8:11      number of non-zero values
@@ -1068,11 +1049,11 @@
 };
 
 const float *const ff_aac_codebook_vector_vals[] = {
-    codebook_vector0_vals, codebook_vector0_vals,
-    codebook_vector2_vals, codebook_vector2_vals,
-    codebook_vector4_vals, codebook_vector4_vals,
-    codebook_vector6_vals, codebook_vector6_vals,
-    codebook_vector8_vals, codebook_vector8_vals,
+    codebook_vector0_vals,  codebook_vector0_vals,
+    codebook_vector10_vals, codebook_vector10_vals,
+    codebook_vector4_vals,  codebook_vector4_vals,
+    codebook_vector10_vals, codebook_vector10_vals,
+    codebook_vector10_vals, codebook_vector10_vals,
     codebook_vector10_vals,
 };