X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fzmbv.c;h=167f6f8826fc889ea1144049b26f5f4e2f98f325;hb=6fb40779cd3457a819e20d6db91a142c47cad3c2;hp=1b9435150f16afc606f1a66aa145a60067764800;hpb=ea5adf7080403ad70a3827830c26319823f49adc;p=ffmpeg diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 1b9435150f1..167f6f8826f 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -30,6 +30,7 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "internal.h" #include @@ -397,7 +398,7 @@ static int zmbv_decode_intra(ZmbvContext *c) return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -411,7 +412,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac c->pic.reference = 3; c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; - if ((ret = avctx->get_buffer(avctx, &c->pic)) < 0) { + if ((ret = ff_get_buffer(avctx, &c->pic)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -600,7 +601,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac } FFSWAP(uint8_t *, c->cur, c->prev); } - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = c->pic; /* always report that the buffer was completely consumed */