ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/sipr.h

 /*
  * SIPR / ACELP.NET decoder
  *
  * Copyright (c) 2008 Vladimir Voroshilov
  * Copyright (c) 2009 Vitor Sessak
  *
  * 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 46 matching lines @@
     AVCodecContext *avctx;
     DSPContext dsp;
 
     SiprMode mode;
 
     float past_pitch_gain;
     float lsf_history[LP_FILTER_ORDER_16k];
 
     float excitation[L_INTERPOL + PITCH_MAX + 2 * L_SUBFR_16k];
 
-    DECLARE_ALIGNED_16(float, synth_buf)[LP_FILTER_ORDER + 5*SUBFR_SIZE + 6];
+    DECLARE_ALIGNED(16, float, synth_buf)[LP_FILTER_ORDER + 5*SUBFR_SIZE + 6];
 
     float lsp_history[LP_FILTER_ORDER];
     float gain_mem;
     float energy_history[4];
     float highpass_filt_mem[2];
     float postfilter_mem[PITCH_DELAY_MAX + LP_FILTER_ORDER];
 
     /* 5k0 */
     float tilt_mem;
     float postfilter_agc;
@@ skipping 20 matching lines @@
 } SiprParameters;
 
 extern const float ff_pow_0_5[16];
 
 void ff_sipr_init_16k(SiprContext *ctx);
 
 void ff_sipr_decode_frame_16k(SiprContext *ctx, SiprParameters *params,
                               float *out_data);
 
 #endif /* AVCODEC_SIPR_H */