X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvcr1.c;h=ea2d5553a6c07ed88483c807e638cce9a570199b;hb=ecc1f8c3c8875e31e7cb9b7d9229b1674e1be736;hp=f316c8fcd899ec19f2a3eb6df8297708c3d9eb94;hpb=d5202e4fda3d6e3d63e032328b7626f779572e76;p=ffmpeg

diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index f316c8fcd89..ea2d5553a6c 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file vcr1.c
+ * @file libavcodec/vcr1.c
  * ati vcr1 codec.
  */
 
@@ -30,6 +30,10 @@
 //#undef NDEBUG
 //#include <assert.h>
 
+/* Disable the encoder. */
+#undef CONFIG_VCR1_ENCODER
+#define CONFIG_VCR1_ENCODER 0
+
 typedef struct VCR1Context{
     AVCodecContext *avctx;
     AVFrame picture;
@@ -39,8 +43,10 @@ typedef struct VCR1Context{
 
 static int 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;
     VCR1Context * const a = avctx->priv_data;
     AVFrame *picture = data;
     AVFrame * const p= (AVFrame*)&a->picture;
@@ -113,13 +119,12 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-#if 0
+#if CONFIG_VCR1_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     VCR1Context * const a = avctx->priv_data;
     AVFrame *pict = data;
     AVFrame * const p= (AVFrame*)&a->picture;
     int size;
-    int mb_x, mb_y;
 
     *p = *pict;
     p->pict_type= FF_I_TYPE;
@@ -153,7 +158,16 @@ static av_cold int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0
+static av_cold int decode_end(AVCodecContext *avctx){
+    VCR1Context *s = avctx->priv_data;
+
+    if (s->picture.data[0])
+        avctx->release_buffer(avctx, &s->picture);
+
+    return 0;
+}
+
+#if CONFIG_VCR1_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
@@ -169,14 +183,13 @@ AVCodec vcr1_decoder = {
     sizeof(VCR1Context),
     decode_init,
     NULL,
-    NULL,
+    decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "ATI VCR1",
+    .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-#if 0
-#ifdef CONFIG_ENCODERS
 
+#if CONFIG_VCR1_ENCODER
 AVCodec vcr1_encoder = {
     "vcr1",
     CODEC_TYPE_VIDEO,
@@ -185,8 +198,6 @@ AVCodec vcr1_encoder = {
     encode_init,
     encode_frame,
     //encode_end,
-    .long_name = "ATI VCR1",
+    .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-
-#endif //CONFIG_ENCODERS
 #endif