Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / frwu.c

diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c
index a0484d3cbf3c9d93f785aa20fdd7a23bfc9802b7..43feb012f2498e797e6a844dfa610ded1f8de0ff 100644 (file)
--- a/libavcodec/frwu.c
+++ b/libavcodec/frwu.c
@@ -22,6 +22,7 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 #include "libavutil/opt.h"
 
 typedef struct {
@@ -44,7 +45,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
     return 0;
 }
 
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                         AVPacket *avpkt)
 {
     FRWUContext *s = avctx->priv_data;
@@ -66,7 +67,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     }
 
     pic->reference = 0;
-    if ((ret = avctx->get_buffer(avctx, pic)) < 0) {
+    if ((ret = ff_get_buffer(avctx, pic)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
@@ -106,7 +107,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         buf += field_size - min_field_size;
     }
 
-    *data_size = sizeof(AVFrame);
+    *got_frame = 1;
     *(AVFrame*)data = *pic;
 
     return avpkt->size;