From 5d67dfd71cfe847680d4e037a4b009041126d789 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 26 May 2013 18:26:07 +0200 Subject: [PATCH] j2kdec: move avctx init to decode_frame Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 340edd19c0..f5d2cb43b6 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -1037,6 +1037,7 @@ static int decode_frame(AVCodecContext *avctx, s->picture = picture; + s->avctx = avctx; bytestream2_init(&s->g, avpkt->data, avpkt->size); s->curtileno = -1; @@ -1086,8 +1087,6 @@ static av_cold int j2kdec_init(AVCodecContext *avctx) { Jpeg2000DecoderContext *s = avctx->priv_data; - s->avctx = avctx; - ff_jpeg2000_init_tier1_luts(); return 0;