diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-03-27 14:06:53 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 19:51:19 +0200 |
| commit | 1cd8510912f87a41ac5c6947dc3151cea36ea623 (patch) | |
| tree | 543aa189b64137983617d8a952883328b7400c0a /libavcodec/j2kdec.c | |
| parent | 6fa998c49109a7222c118ab91b6eda26ca6d69ad (diff) | |
| download | ffmpeg-1cd8510912f87a41ac5c6947dc3151cea36ea623.tar.gz | |
j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2kdec.c')
| -rw-r--r-- | libavcodec/j2kdec.c | 5 |
1 files 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; } |