X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmm.c;h=125a6773c407d99330dd213f5ce3d5033118bd7d;hb=18b0c39f99eee508107c47345494e535b8757434;hp=d7308b9a907c409049c00985ac9c07a1beda46c5;hpb=394b692b70587af74a6957640cab0dce3bc9934d;p=ffmpeg

diff --git a/libavformat/mm.c b/libavformat/mm.c
index d7308b9a907..125a6773c40 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -109,7 +109,7 @@ static int read_header(AVFormatContext *s)
     if (!st)
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_MMVIDEO;
+    st->codec->codec_id = AV_CODEC_ID_MMVIDEO;
     st->codec->codec_tag = 0;  /* no fourcc */
     st->codec->width = width;
     st->codec->height = height;
@@ -122,7 +122,7 @@ static int read_header(AVFormatContext *s)
             return AVERROR(ENOMEM);
         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_tag = 0; /* no fourcc */
-        st->codec->codec_id = CODEC_ID_PCM_U8;
+        st->codec->codec_id = AV_CODEC_ID_PCM_U8;
         st->codec->channels = 1;
         st->codec->sample_rate = 8000;
         avpriv_set_pts_info(st, 64, 1, 8000); /* 8000 hz */
@@ -187,7 +187,7 @@ static int read_packet(AVFormatContext *s,
 
 AVInputFormat ff_mm_demuxer = {
     .name           = "mm",
-    .long_name      = NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("American Laser Games MM"),
     .priv_data_size = sizeof(MmDemuxContext),
     .read_probe     = probe,
     .read_header    = read_header,