X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fpictordec.c;h=b7d7bf0cd44457199ccbc23019d25a6f6ad9f094;hb=e5550c0d0971e393ba221cd69506acd2c2dab89c;hp=748d9b3bcbaadb039a93c3e792d866ba8fee74d8;hpb=03b078721c8e42c413da75f553e740d235092dad;p=ffmpeg diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 748d9b3bcba..b7d7bf0cd44 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "bytestream.h" #include "cga_data.h" +#include "internal.h" typedef struct PicContext { AVFrame frame; @@ -105,7 +106,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } static int decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { PicContext *s = avctx->priv_data; @@ -154,7 +155,7 @@ static int decode_frame(AVCodecContext *avctx, avctx->release_buffer(avctx, &s->frame); } - if (avctx->get_buffer(avctx, &s->frame) < 0){ + if (ff_get_buffer(avctx, &s->frame) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } @@ -257,7 +258,7 @@ static int decode_frame(AVCodecContext *avctx, } } - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = s->frame; return avpkt->size; }