PPC: gas-preprocessor handles m[ft]spr shorthands

[ffmpeg] / libavcodec / imc.c

diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 1bbd0b45b8be9b44b4d1aedcb7a1c1056c55c14e..2a420f5bcf0961933e145ff911449de8992bb380 100644 (file)
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -22,7 +22,8 @@
  */
 
 /**
- *  @file libavcodec/imc.c IMC - Intel Music Coder
+ *  @file
+ *  IMC - Intel Music Coder
  *  A mdct based codec using a 256 points large transform
  *  divied into 32 bands with some mix of scale factors.
  *  Only mono is supported.
@@ -38,6 +39,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "fft.h"
 
 #include "imcdata.h"
 
@@ -84,8 +86,8 @@ typedef struct {
 
     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];
@@ -822,7 +824,7 @@ static av_cold int imc_decode_close(AVCodecContext * avctx)
 
 AVCodec imc_decoder = {
     .name = "imc",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_IMC,
     .priv_data_size = sizeof(IMCContext),
     .init = imc_decode_init,