summaryrefslogtreecommitdiff
path: root/libavcodec/mxpegdec.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/mxpegdec.c
parent387bef95d28019c13c6805cfa4079e59948284e5 (diff)
lavc: fix decode_frame() third parameter semantics for video decoders
It's got_frame, not data size
Diffstat (limited to 'libavcodec/mxpegdec.c')
-rw-r--r--libavcodec/mxpegdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c
index 13a0d4c078..d81e9fc853 100644
--- a/libavcodec/mxpegdec.c
+++ b/libavcodec/mxpegdec.c
@@ -156,7 +156,7 @@ static int mxpeg_check_dimensions(MXpegDecodeContext *s, MJpegDecodeContext *jpg
}
static int mxpeg_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
@@ -293,7 +293,7 @@ static int mxpeg_decode_frame(AVCodecContext *avctx,
the_end:
if (jpg->got_picture) {
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
*picture = *jpg->picture_ptr;
s->picture_index ^= 1;
jpg->picture_ptr = &s->picture[s->picture_index];
@@ -302,7 +302,7 @@ the_end:
if (!s->got_mxm_bitmask)
s->has_complete_frame = 1;
else
- *data_size = 0;
+ *got_frame = 0;
}
}