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/vmnc.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/vmnc.c')
| -rw-r--r-- | libavcodec/vmnc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index 3153be6844..4071cdf51a 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -285,7 +285,8 @@ static int decode_hextile(VmncContext *c, uint8_t* dst, const uint8_t* src, int return src - ssrc; } -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; @@ -446,7 +447,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac put_cursor(outptr, c->pic.linesize[0], c, c->cur_x, c->cur_y); } } - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = c->pic; /* always report that the buffer was completely consumed */ |