diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-13 19:35:22 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-12-04 21:45:36 +0100 |
| commit | df9b9567518f2840d79a4a96b447ebe1aa326408 (patch) | |
| tree | 7f247e6d290e56536306d6ce157e76f6025fee66 /libavcodec/vb.c | |
| parent | 387bef95d28019c13c6805cfa4079e59948284e5 (diff) | |
| download | ffmpeg-df9b9567518f2840d79a4a96b447ebe1aa326408.tar.gz | |
lavc: fix decode_frame() third parameter semantics for video decoders
It's got_frame, not data size
Diffstat (limited to 'libavcodec/vb.c')
| -rw-r--r-- | libavcodec/vb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vb.c b/libavcodec/vb.c index f5e15cdb18..1e241e7d5a 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -185,7 +185,8 @@ static int vb_decode_framedata(VBDecContext *c, int offset) 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) { VBDecContext * const c = avctx->priv_data; uint8_t *outptr, *srcptr; @@ -235,7 +236,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac FFSWAP(uint8_t*, c->frame, c->prev_frame); - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = c->pic; /* always report that the buffer was completely consumed */ |