ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/imc.c

 /*
  * IMC compatible decoder
  * Copyright (c) 2002-2004 Maxim Poliakovski
  * Copyright (c) 2006 Benjamin Larsson
  * Copyright (c) 2006 Konstantin Shishkov
  *
  * 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
@@ skipping 20 matching lines @@
 
 
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #define ALT_BITSTREAM_READER
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "fft.h"
 
 #include "imcdata.h"
 
 #define IMC_BLOCK_SIZE 64
 #define IMC_FRAME_ID 0x21
 #define BANDS 32
 #define COEFFS 256
 
 typedef struct {
     float old_floor[BANDS];
@@ skipping 26 matching lines @@
     int skipFlagCount[BANDS];  ///< skipped coeffients per band
     int skipFlags[COEFFS];     ///< skip coefficient decoding or not
     int codewords[COEFFS];     ///< raw codewords read from bitstream
     float sqrt_tab[30];
     GetBitContext gb;
     int decoder_reset;
     float one_div_log2;
 
     DSPContext dsp;
     FFTContext fft;
-    DECLARE_ALIGNED_16(FFTComplex, samples)[COEFFS/2];
-    DECLARE_ALIGNED_16(float, out_samples)[COEFFS];
+    DECLARE_ALIGNED(16, FFTComplex, samples)[COEFFS/2];
+    DECLARE_ALIGNED(16, float, out_samples)[COEFFS];
 } IMCContext;
 
 static VLC huffman_vlc[4][4];
 
 #define VLC_TABLES_SIZE 9512
 
 static const int vlc_offsets[17] = {
     0,     640, 1156, 1732, 2308, 2852, 3396, 3924,
     4452, 5220, 5860, 6628, 7268, 7908, 8424, 8936, VLC_TABLES_SIZE};
 
@@ skipping 724 matching lines @@
 AVCodec imc_decoder = {
     .name = "imc",
     .type = CODEC_TYPE_AUDIO,
     .id = CODEC_ID_IMC,
     .priv_data_size = sizeof(IMCContext),
     .init = imc_decode_init,
     .close = imc_decode_close,
     .decode = imc_decode_frame,
     .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"),
 };