ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/nellymoserenc.c

 /*
  * Nellymoser encoder
  * This code is developed as part of Google Summer of Code 2008 Program.
  *
  * Copyright (c) 2008 Bartlomiej Wolowiec
  *
  * 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 @@
  * Some information also from: http://samples.mplayerhq.hu/A-codecs/Nelly_Moser/ASAO/ASAO.zip
  *                             (Copyright Joseph Artsimovich and UAB "DKD")
  *
  * for more information about nellymoser format, visit:
  * http://wiki.multimedia.cx/index.php?title=Nellymoser
  */
 
 #include "nellymoser.h"
 #include "avcodec.h"
 #include "dsputil.h"
+#include "fft.h"
 
 #define BITSTREAM_WRITER_LE
 #include "put_bits.h"
 
 #define POW_TABLE_SIZE (1<<11)
 #define POW_TABLE_OFFSET 3
 #define OPT_SIZE ((1<<15) + 3000)
 
 typedef struct NellyMoserEncodeContext {
     AVCodecContext  *avctx;
     int             last_frame;
     int             bufsel;
     int             have_saved;
     DSPContext      dsp;
     FFTContext      mdct_ctx;
-    DECLARE_ALIGNED_16(float, mdct_out)[NELLY_SAMPLES];
-    DECLARE_ALIGNED_16(float, in_buff)[NELLY_SAMPLES];
-    DECLARE_ALIGNED_16(float, buf)[2][3 * NELLY_BUF_LEN];     ///< sample buffer
+    DECLARE_ALIGNED(16, float, mdct_out)[NELLY_SAMPLES];
+    DECLARE_ALIGNED(16, float, in_buff)[NELLY_SAMPLES];
+    DECLARE_ALIGNED(16, float, buf)[2][3 * NELLY_BUF_LEN];     ///< sample buffer
     float           (*opt )[NELLY_BANDS];
     uint8_t         (*path)[NELLY_BANDS];
 } NellyMoserEncodeContext;
 
 static float pow_table[POW_TABLE_SIZE];     ///< -pow(2, -i / 2048.0 - 3.0);
 
 static const uint8_t sf_lut[96] = {
      0,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  3,  3,  3,  4,  4,
      5,  5,  5,  6,  7,  7,  8,  8,  9, 10, 11, 11, 12, 13, 13, 14,
     15, 15, 16, 17, 17, 18, 19, 19, 20, 21, 22, 22, 23, 24, 25, 26,
@@ skipping 316 matching lines @@
     .name = "nellymoser",
     .type = CODEC_TYPE_AUDIO,
     .id = CODEC_ID_NELLYMOSER,
     .priv_data_size = sizeof(NellyMoserEncodeContext),
     .init = encode_init,
     .encode = encode_frame,
     .close = encode_end,
     .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
     .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 };