Add stereo rematrixing support to the AC-3 encoders.

[ffmpeg] / libavcodec / rl2.c

diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index d9b7d648389d64ef15092f5d914b84b807a81228..ba99fb91b89ddd09fdf70995be2fe421e4858439 100644 (file)
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -21,7 +21,7 @@
 
 /**
  * RL2 Video Decoder
- * @file rl2.c
+ * @file
  * @author Sascha Sommer (saschasommer@freenet.de)
  * For more information about the RL2 format, visit:
  *   http://wiki.multimedia.cx/index.php?title=RL2
@@ -30,8 +30,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 
@@ -50,7 +50,7 @@ typedef struct Rl2Context {
 /**
  * Run Length Decode a single 320x200 frame
  * @param s rl2 context
- * @param buf input buffer
+ * @param in input buffer
  * @param size input buffer size
  * @param out ouput buffer
  * @param stride stride of the output buffer
@@ -169,19 +169,12 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx)
 }
 
 
-/**
- * Decode a single frame
- * @param avctx decoder context
- * @param data decoded frame
- * @param data_size size of the decoded frame
- * @param buf input buffer
- * @param buf_size input buffer size
- * @return 0 success, -1 on error
- */
 static int rl2_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
-                              const uint8_t *buf, int buf_size)
+                              AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     Rl2Context *s = avctx->priv_data;
 
     if(s->frame.data[0])
@@ -228,7 +221,7 @@ static av_cold int rl2_decode_end(AVCodecContext *avctx)
 
 AVCodec rl2_decoder = {
     "rl2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RL2,
     sizeof(Rl2Context),
     rl2_decode_init,
@@ -236,6 +229,6 @@ AVCodec rl2_decoder = {
     rl2_decode_end,
     rl2_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "RL2 video",
+    .long_name = NULL_IF_CONFIG_SMALL("RL2 video"),
 };