summaryrefslogtreecommitdiff
path: root/libavcodec/j2kdec.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-12-05 18:24:43 +0000
committerPaul B Mahol <onemda@gmail.com>2012-12-05 18:24:43 +0000
commit4012cd6c4f19f09cac86c9b8c9738f27bb691764 (patch)
tree605a9342eb74f30c32ce1a772880612e7066d930 /libavcodec/j2kdec.c
parent835fd779a46d14d6999618546a9833b3f2af2326 (diff)
lavc: fix decode_frame() third parameter semantics for rest of video decoders
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/j2kdec.c')
-rw-r--r--libavcodec/j2kdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index a9b4ccf3d6..53c4f079f8 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -1018,7 +1018,7 @@ static int jp2_find_codestream(J2kDecoderContext *s)
}
static int decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
J2kDecoderContext *s = avctx->priv_data;
@@ -1061,7 +1061,7 @@ static int decode_frame(AVCodecContext *avctx,
cleanup(s);
- *data_size = sizeof(AVPicture);
+ *got_frame = 1;
*picture = s->picture;
return bytestream2_tell(&s->g);