ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/cook.c

 /*
  * COOK compatible decoder
  * Copyright (c) 2003 Sascha Sommer
  * Copyright (c) 2005 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 34 matching lines @@
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "bytestream.h"
+#include "fft.h"
 
 #include "cookdata.h"
 
 /* the different Cook versions */
 #define MONO            0x1000001
 #define STEREO          0x1000002
 #define JOINT_STEREO    0x1000003
 #define MC_COOK         0x2000000   //multichannel Cook, not supported
 
 #define SUBBAND_SIZE    20
@@ skipping 78 matching lines @@
     VLC                 envelope_quant_index[13];
     VLC                 sqvh[7];          //scalar quantization
 
     /* generatable tables and related variables */
     int                 gain_size_factor;
     float               gain_table[23];
 
     /* data buffers */
 
     uint8_t*            decoded_bytes_buffer;
-    DECLARE_ALIGNED_16(float,mono_mdct_output)[2048];
+    DECLARE_ALIGNED(16, float,mono_mdct_output)[2048];
     float               decode_buffer_1[1024];
     float               decode_buffer_2[1024];
     float               decode_buffer_0[1060]; /* static allocation for joint decode */
 
     const float         *cplscales[5];
     int                 num_subpackets;
     COOKSubpacket       subpacket[MAX_SUBPACKETS];
 } COOKContext;
 
 static float     pow2tab[127];
@@ skipping 1124 matching lines @@
 {
     .name = "cook",
     .type = CODEC_TYPE_AUDIO,
     .id = CODEC_ID_COOK,
     .priv_data_size = sizeof(COOKContext),
     .init = cook_decode_init,
     .close = cook_decode_close,
     .decode = cook_decode_frame,
     .long_name = NULL_IF_CONFIG_SMALL("COOK"),
 };