X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frl2.c;h=1b193b002aedecadc4ca332fd73f1d579c09091b;hb=36aa7bc27f7122296b90d775bc6d209ebc784f73;hp=ca81ff8e34f38322f1e67d7713dd23bc1ed83a91;hpb=f4433de9ef53b78397c58828e9bf84fb59160aed;p=ffmpeg

diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index ca81ff8e34f..1b193b002ae 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -21,7 +21,7 @@
 
 /**
  * RL2 file demuxer
- * @file rl2.c
+ * @file libavformat/rl2.c
  * @author Sascha Sommer (saschasommer@freenet.de)
  * For more information regarding the RL2 file format, visit:
  *   http://wiki.multimedia.cx/index.php?title=RL2
@@ -33,6 +33,7 @@
  * optional background_frame
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define EXTRADATA1_SIZE (6 + 256 * 3) ///< video base, clr, palette
@@ -148,12 +149,12 @@ static av_cold int rl2_read_header(AVFormatContext *s,
         st->codec->codec_id = CODEC_ID_PCM_U8;
         st->codec->codec_tag = 1;
         st->codec->channels = channels;
-        st->codec->bits_per_sample = 8;
+        st->codec->bits_per_coded_sample = 8;
         st->codec->sample_rate = rate;
         st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
-            st->codec->bits_per_sample;
+            st->codec->bits_per_coded_sample;
         st->codec->block_align = st->codec->channels *
-            st->codec->bits_per_sample / 8;
+            st->codec->bits_per_coded_sample / 8;
         av_set_pts_info(st,32,1,rate);
     }
 
@@ -288,7 +289,7 @@ static int rl2_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
 AVInputFormat rl2_demuxer = {
     "rl2",
-    "rl2 format",
+    NULL_IF_CONFIG_SMALL("RL2 format"),
     sizeof(Rl2DemuxContext),
     rl2_probe,
     rl2_read_header,