ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/nellymoserdec.c

 /*
  * NellyMoser audio decoder
  * Copyright (c) 2007 a840bda5870ba11f19698ff6eb9581dfb0f95fa5,
  *                    539459aeb7d425140b62a3ec7dbf6dc8e408a306, and
  *                    520e17cd55896441042b14df2566a6eb610ed444
  * Copyright (c) 2007 Loic Minier <lool at dooz.org>
  *                    Benjamin Larsson
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ skipping 18 matching lines @@
  * @file libavcodec/nellymoserdec.c
  * The 3 alphanumeric copyright notices are md5summed they are from the original
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
 #include "nellymoser.h"
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
 #include "avcodec.h"
 #include "dsputil.h"
+#include "fft.h"
 
 #define ALT_BITSTREAM_READER_LE
 #include "get_bits.h"
 
 
 typedef struct NellyMoserDecodeContext {
     AVCodecContext* avctx;
-    DECLARE_ALIGNED_16(float,float_buf)[NELLY_SAMPLES];
+    DECLARE_ALIGNED(16, float,float_buf)[NELLY_SAMPLES];
     float           state[128];
     AVLFG           random_state;
     GetBitContext   gb;
     int             add_bias;
     float           scale_bias;
     DSPContext      dsp;
     FFTContext      imdct_ctx;
-    DECLARE_ALIGNED_16(float,imdct_out)[NELLY_BUF_LEN * 2];
+    DECLARE_ALIGNED(16, float,imdct_out)[NELLY_BUF_LEN * 2];
 } NellyMoserDecodeContext;
 
 static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *audio, float *a_in)
 {
     int bot, top;
 
     bot = 0;
     top = NELLY_BUF_LEN-1;
 
     while (bot < NELLY_BUF_LEN) {
@@ skipping 137 matching lines @@
     CODEC_TYPE_AUDIO,
     CODEC_ID_NELLYMOSER,
     sizeof(NellyMoserDecodeContext),
     decode_init,
     NULL,
     decode_end,
     decode_tag,
     .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 };