From 1cd8510912f87a41ac5c6947dc3151cea36ea623 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 27 Mar 2012 14:06:53 +0000 Subject: [PATCH] j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init() Signed-off-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 6a4b2b6ad8..59ae869acf 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -1021,8 +1021,6 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_init(&s->g, avpkt->data, avpkt->size); s->curtileno = -1; - ff_j2k_init_tier1_luts(); - if (bytestream2_get_bytes_left(&s->g) < 2) { ret = AVERROR(EINVAL); goto err_out; @@ -1072,6 +1070,9 @@ static av_cold int j2kdec_init(AVCodecContext *avctx) avcodec_get_frame_defaults((AVFrame*)&s->picture); avctx->coded_frame = (AVFrame*)&s->picture; + + ff_j2k_init_tier1_luts(); + return 0; }