Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / lmlm4.c

diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c
index 24ae289cbef11fb32ecb9b4a9d1a35cfc47d3c42..c3eec02e8fecfab6282dfc3af2d60228513d71a4 100644 (file)
--- a/libavformat/lmlm4.c
+++ b/libavformat/lmlm4.c
@@ -64,14 +64,14 @@ static int lmlm4_read_header(AVFormatContext *s) {
     if (!(st = avformat_new_stream(s, NULL)))
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id   = CODEC_ID_MPEG4;
+    st->codec->codec_id   = AV_CODEC_ID_MPEG4;
     st->need_parsing      = AVSTREAM_PARSE_HEADERS;
     avpriv_set_pts_info(st, 64, 1001, 30000);
 
     if (!(st = avformat_new_stream(s, NULL)))
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id   = CODEC_ID_MP2;
+    st->codec->codec_id   = AV_CODEC_ID_MP2;
     st->need_parsing      = AVSTREAM_PARSE_HEADERS;
 
     /* the parameters will be extracted from the compressed bitstream */
@@ -120,7 +120,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
 
 AVInputFormat ff_lmlm4_demuxer = {
     .name           = "lmlm4",
-    .long_name      = NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("raw lmlm4"),
     .read_probe     = lmlm4_probe,
     .read_header    = lmlm4_read_header,
     .read_packet    = lmlm4_read_packet,