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/flicvideo.c | |
| parent | 387bef95d28019c13c6805cfa4079e59948284e5 (diff) | |
| download | ffmpeg-streaming-df9b9567518f2840d79a4a96b447ebe1aa326408.zip ffmpeg-streaming-df9b9567518f2840d79a4a96b447ebe1aa326408.tar.gz | |
lavc: fix decode_frame() third parameter semantics for video decoders
It's got_frame, not data size
Diffstat (limited to 'libavcodec/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 2b9b290..02bfc75 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -129,7 +129,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) } static int flic_decode_frame_8BPP(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, const uint8_t *buf, int buf_size) { FlicDecodeContext *s = avctx->priv_data; @@ -419,14 +419,14 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, s->new_palette = 0; } - *data_size=sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = s->frame; return buf_size; } static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, const uint8_t *buf, int buf_size) { /* Note, the only difference between the 15Bpp and 16Bpp */ @@ -681,14 +681,14 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, "and final chunk ptr = %d\n", buf_size, bytestream2_tell(&g2)); - *data_size=sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = s->frame; return buf_size; } static int flic_decode_frame_24BPP(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, const uint8_t *buf, int buf_size) { av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n"); @@ -696,22 +696,22 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx, } static int flic_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { - return flic_decode_frame_8BPP(avctx, data, data_size, + return flic_decode_frame_8BPP(avctx, data, got_frame, buf, buf_size); } else if ((avctx->pix_fmt == AV_PIX_FMT_RGB555) || (avctx->pix_fmt == AV_PIX_FMT_RGB565)) { - return flic_decode_frame_15_16BPP(avctx, data, data_size, + return flic_decode_frame_15_16BPP(avctx, data, got_frame, buf, buf_size); } else if (avctx->pix_fmt == AV_PIX_FMT_BGR24) { - return flic_decode_frame_24BPP(avctx, data, data_size, + return flic_decode_frame_24BPP(avctx, data, got_frame, buf, buf_size); } |
