ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/atrac3.c

Index: patched-ffmpeg-mt/libavcodec/atrac3.c
===================================================================
--- patched-ffmpeg-mt/libavcodec/atrac3.c	(revision 41250)
+++ patched-ffmpeg-mt/libavcodec/atrac3.c	(working copy)
@@ -40,6 +40,7 @@
 #include "get_bits.h"
 #include "dsputil.h"
 #include "bytestream.h"
+#include "fft.h"
 
 #include "atrac.h"
 #include "atrac3data.h"
@@ -73,8 +74,8 @@
     int               gcBlkSwitch;
     gain_block        gainBlock[2];
 
-    DECLARE_ALIGNED_16(float, spectrum)[1024];
-    DECLARE_ALIGNED_16(float, IMDCT_buf)[1024];
+    DECLARE_ALIGNED(16, float, spectrum)[1024];
+    DECLARE_ALIGNED(16, float, IMDCT_buf)[1024];
 
     float             delayBuf1[46]; ///<qmf delay buffers
     float             delayBuf2[46];
@@ -119,7 +120,7 @@
     //@}
 } ATRAC3Context;
 
-static DECLARE_ALIGNED_16(float,mdct_window)[512];
+static DECLARE_ALIGNED(16, float,mdct_window)[512];
 static VLC              spectral_coeff_tab[7];
 static float            gain_tab1[16];
 static float            gain_tab2[31];