Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

[ffmpeg] / libavformat / rl2.c

diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index fbf52f4660d5e310fe894f2d59e461b6e93ca1fe..73d6b2767a06372b1df1ac15c588a8c8d4250ae4 100644 (file)
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -114,7 +114,7 @@ static av_cold int rl2_read_header(AVFormatContext *s)
          return AVERROR(ENOMEM);
 
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_RL2;
+    st->codec->codec_id = AV_CODEC_ID_RL2;
     st->codec->codec_tag = 0;  /* no fourcc */
     st->codec->width = 320;
     st->codec->height = 200;
@@ -146,7 +146,7 @@ static av_cold int rl2_read_header(AVFormatContext *s)
         if (!st)
             return AVERROR(ENOMEM);
         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-        st->codec->codec_id = CODEC_ID_PCM_U8;
+        st->codec->codec_id = AV_CODEC_ID_PCM_U8;
         st->codec->codec_tag = 1;
         st->codec->channels = channels;
         st->codec->bits_per_coded_sample = 8;
@@ -289,7 +289,7 @@ static int rl2_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
 AVInputFormat ff_rl2_demuxer = {
     .name           = "rl2",
-    .long_name      = NULL_IF_CONFIG_SMALL("RL2 format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("RL2"),
     .priv_data_size = sizeof(Rl2DemuxContext),
     .read_probe     = rl2_probe,
     .read_header    = rl2_read_header,