idct_sse2_xvid: remove libavutil/internal.h include

[ffmpeg] / libavcodec / mace.c

diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index dd721d24b5e62a4d9240faa49a8466d4580779b7..4c7097943fe1cb0774754ae01c1969936c27dae3 100644 (file)
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -25,6 +25,7 @@
  */
 
 #include "avcodec.h"
+#include "libavutil/common.h"
 
 /*
  * Adapted to libavcodec by Francois Revol <revol@free.fr>
@@ -249,7 +250,7 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data,
     int16_t *samples;
     MACEContext *ctx = avctx->priv_data;
     int i, j, k, l, ret;
-    int is_mace3 = (avctx->codec_id == CODEC_ID_MACE3);
+    int is_mace3 = (avctx->codec_id == AV_CODEC_ID_MACE3);
 
     /* get output buffer */
     ctx->frame.nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels;
@@ -292,7 +293,7 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data,
 AVCodec ff_mace3_decoder = {
     .name           = "mace3",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_MACE3,
+    .id             = AV_CODEC_ID_MACE3,
     .priv_data_size = sizeof(MACEContext),
     .init           = mace_decode_init,
     .decode         = mace_decode_frame,
@@ -303,7 +304,7 @@ AVCodec ff_mace3_decoder = {
 AVCodec ff_mace6_decoder = {
     .name           = "mace6",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_MACE6,
+    .id             = AV_CODEC_ID_MACE6,
     .priv_data_size = sizeof(MACEContext),
     .init           = mace_decode_init,
     .decode         = mace_decode_frame,