tiffdec: support LZW compression with inverted FillOrder

[ffmpeg] / libavcodec / brender_pix.c

diff --git a/libavcodec/brender_pix.c b/libavcodec/brender_pix.c
index 886e8fbfe6123ff896ddfc9e45365c194c2075d5..5245fa0d71c4672c0520ca434f5fca3f74b673bc 100644 (file)
--- a/libavcodec/brender_pix.c
+++ b/libavcodec/brender_pix.c
@@ -28,6 +28,7 @@
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 typedef struct BRPixContext {
     AVFrame frame;
@@ -69,7 +70,7 @@ static int brpix_decode_header(BRPixHeader *out, GetByteContext *pgb)
 }
 
 static int brpix_decode_frame(AVCodecContext *avctx,
-                              void *data, int *data_size_out,
+                              void *data, int *got_frame,
                               AVPacket *avpkt)
 {
     BRPixContext *s = avctx->priv_data;
@@ -151,7 +152,7 @@ static int brpix_decode_frame(AVCodecContext *avctx,
     if (hdr.width != avctx->width || hdr.height != avctx->height)
         avcodec_set_dimensions(avctx, hdr.width, hdr.height);
 
-    if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {
+    if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
@@ -216,7 +217,7 @@ static int brpix_decode_frame(AVCodecContext *avctx,
     }
 
     *frame_out = s->frame;
-    *data_size_out = sizeof(AVFrame);
+    *got_frame = 1;
 
     return avpkt->size;
 }