Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*

[ffmpeg] / libavcodec / mace.c

diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index 94646106c3aa9bd35ae3d4f7c76ba6cfb4dc85b3..1b8c9d0836084f7a60726a45e575fb13f7683a02 100644 (file)
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file mace.c
+ * @file
  * MACE decoder.
  */
 
@@ -230,14 +230,16 @@ static av_cold int mace_decode_init(AVCodecContext * avctx)
 {
     if (avctx->channels > 2)
         return -1;
-    avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->sample_fmt = AV_SAMPLE_FMT_S16;
     return 0;
 }
 
-static int mace3_decode_frame(AVCodecContext *avctx,
+static int mace_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
-                              const uint8_t *buf, int buf_size)
+                              AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     int16_t *samples = data;
     MACEContext *ctx = avctx->priv_data;
     int i, j, k, l;
@@ -277,27 +279,27 @@ static int mace3_decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-AVCodec mace3_decoder = {
+AVCodec ff_mace3_decoder = {
     "mace3",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MACE3,
     sizeof(MACEContext),
     mace_decode_init,
     NULL,
     NULL,
-    mace3_decode_frame,
+    mace_decode_frame,
     .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
 };
 
-AVCodec mace6_decoder = {
+AVCodec ff_mace6_decoder = {
     "mace6",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_MACE6,
     sizeof(MACEContext),
     mace_decode_init,
     NULL,
     NULL,
-    mace3_decode_frame,
+    mace_decode_frame,
     .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
 };