hls: Set stream offset before opening a chained demuxer

[ffmpeg] / libavformat / rl2.c

diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index bb0a961a66a072e68c979609ae6b4450107c6aa1..ac0532f1c9915368421c827f9e3586038e820a8d 100644 (file)
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -69,7 +69,6 @@ static int rl2_probe(AVProbeData *p)
 /**
  * read rl2 header data and setup the avstreams
  * @param s demuxer context
- * @param ap format parameters
  * @return 0 on success, AVERROR otherwise
  */
 static av_cold int rl2_read_header(AVFormatContext *s)
@@ -115,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;
@@ -144,7 +143,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;
@@ -287,7 +286,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,