summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-13 19:35:22 +0100
committerAnton Khirnov <anton@khirnov.net>2012-12-04 21:45:36 +0100
commitdf9b9567518f2840d79a4a96b447ebe1aa326408 (patch)
tree7f247e6d290e56536306d6ce157e76f6025fee66 /libavcodec/mjpegdec.c
parent387bef95d28019c13c6805cfa4079e59948284e5 (diff)
lavc: fix decode_frame() third parameter semantics for video decoders
It's got_frame, not data size
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 04249dd97d..104a63d5fd 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1436,7 +1436,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
return start_code;
}
-int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
@@ -1551,7 +1551,7 @@ eoi_parser:
goto not_the_end;
}
*picture = *s->picture_ptr;
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
if (!s->lossless) {
picture->quality = FFMAX3(s->qscale[0],