summaryrefslogtreecommitdiffstats
path: root/libavcodec/mmvideo.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/mmvideo.c
parent387bef95d28019c13c6805cfa4079e59948284e5 (diff)
downloadffmpeg-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/mmvideo.c')
-rw-r--r--libavcodec/mmvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 9959d5f..784b939 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -172,7 +172,7 @@ static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert)
}
static int mm_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
@@ -209,7 +209,7 @@ static int mm_decode_frame(AVCodecContext *avctx,
memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
*(AVFrame*)data = s->frame;
return buf_size;
OpenPOWER on IntegriCloud