ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/atrac3.c

 /*
  * Atrac 3 compatible decoder
  * Copyright (c) 2006-2008 Maxim Poliakovski
  * Copyright (c) 2006-2008 Benjamin Larsson
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg 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
@@ skipping 22 matching lines @@
  */
 
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "bytestream.h"
+#include "fft.h"
 
 #include "atrac.h"
 #include "atrac3data.h"
 
 #define JOINT_STEREO    0x12
 #define STEREO          0x2
 
 
 /* These structures are needed to store the parsed gain control data. */
 typedef struct {
@@ skipping 13 matching lines @@
 } tonal_component;
 
 typedef struct {
     int               bandsCoded;
     int               numComponents;
     tonal_component   components[64];
     float             prevFrame[1024];
     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];
     float             delayBuf3[46];
 } channel_unit;
 
 typedef struct {
     GetBitContext       gb;
     //@{
     /** stream data */
@@ skipping 24 matching lines @@
     //@}
     //@{
     /** extradata */
     int                 atrac3version;
     int                 delay;
     int                 scrambled_stream;
     int                 frame_factor;
     //@}
 } 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];
 static FFTContext       mdct_ctx;
 static DSPContext       dsp;
 
 
 /**
  * Regular 512 points IMDCT without overlapping, with the exception of the swapping of odd bands
  * caused by the reverse spectra of the QMF.
@@ skipping 883 matching lines @@
 {
     .name = "atrac3",
     .type = CODEC_TYPE_AUDIO,
     .id = CODEC_ID_ATRAC3,
     .priv_data_size = sizeof(ATRAC3Context),
     .init = atrac3_decode_init,
     .close = atrac3_decode_close,
     .decode = atrac3_decode_frame,
     .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"),
 };