aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/eamad.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/eamad.c
parent387bef95d28019c13c6805cfa4079e59948284e5 (diff)
downloadffmpeg-df9b9567518f2840d79a4a96b447ebe1aa326408.tar.gz
lavc: fix decode_frame() third parameter semantics for video decoders
It's got_frame, not data size
Diffstat (limited to 'libavcodec/eamad.c')
-rw-r--r--libavcodec/eamad.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index ec74051b2f..9f4d85878a 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -219,7 +219,7 @@ static void calc_quant_matrix(MadContext *s, int qscale)
}
static int decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
@@ -232,7 +232,7 @@ static int decode_frame(AVCodecContext *avctx,
if (buf_size < 17) {
av_log(avctx, AV_LOG_ERROR, "Input buffer too small\n");
- *data_size = 0;
+ *got_frame = 0;
return -1;
}
@@ -274,7 +274,7 @@ static int decode_frame(AVCodecContext *avctx,
for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++)
decode_mb(s, inter);
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
*(AVFrame*)data = s->frame;
if (chunk_type != MADe_TAG)