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/proresdec.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/proresdec.c')
| -rw-r--r-- | libavcodec/proresdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c index 79995791d6..f7e32c998b 100644 --- a/libavcodec/proresdec.c +++ b/libavcodec/proresdec.c @@ -599,7 +599,7 @@ static int decode_picture(ProresContext *ctx, int pic_num, #define MOVE_DATA_PTR(nbytes) buf += (nbytes); buf_size -= (nbytes) -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { ProresContext *ctx = avctx->priv_data; @@ -641,7 +641,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, MOVE_DATA_PTR(pic_data_size); } - *data_size = sizeof(AVPicture); + *got_frame = 1; *(AVFrame*) data = *avctx->coded_frame; return avpkt->size; |