diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 17:42:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 18:07:48 +0200 |
| commit | e66faf71eb89e4babcf8d48873768faad7847bcb (patch) | |
| tree | 22fdd88f1c5395e2aa0701b031456dae3bf0d57c | |
| parent | b67fe48f3418e385acb1b4f6e8d640effa250dab (diff) | |
j2k: merge ff_j2k_init_tier1_luts()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/j2k.c | 11 | ||||
| -rw-r--r-- | libavcodec/j2k.h | 2 | ||||
| -rw-r--r-- | libavcodec/j2kdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/j2kenc.c | 2 |
4 files changed, 3 insertions, 14 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c index d5591b622b..fdd86d5cce 100644 --- a/libavcodec/j2k.c +++ b/libavcodec/j2k.c @@ -161,17 +161,6 @@ static int getsgnctxno(int flag, uint8_t *xorbit) return ctxlbltab[hcontrib][vcontrib]; } -void ff_j2k_init_tier1_luts(void) -{ - int i, j; - for (i = 0; i < 256; i++) - for (j = 0; j < 4; j++) - ff_jpeg2000_sigctxno_lut[i][j] = getsigctxno(i, j); - for (i = 0; i < 16; i++) - for (j = 0; j < 16; j++) - ff_jpeg2000_sgnctxno_lut[i][j] = getsgnctxno(i + (j << 8), &ff_jpeg2000_xorbit_lut[i][j]); -} - void ff_j2k_set_significant(Jpeg2000T1Context *t1, int x, int y, int negative) { x++; y++; diff --git a/libavcodec/j2k.h b/libavcodec/j2k.h index 2757621d83..2c94d05ebe 100644 --- a/libavcodec/j2k.h +++ b/libavcodec/j2k.h @@ -207,7 +207,7 @@ static inline int ff_jpeg2000_ceildiv(int a, int b) Jpeg2000TgtNode *ff_j2k_tag_tree_init(int w, int h); /* TIER-1 routines */ -void ff_j2k_init_tier1_luts(void); +void ff_jpeg2000_init_tier1_luts(void); void ff_j2k_set_significant(Jpeg2000T1Context *t1, int x, int y, int negative); diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index f46628e416..034e42b0e3 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -1088,7 +1088,7 @@ static av_cold int j2kdec_init(AVCodecContext *avctx) s->avctx = avctx; - ff_j2k_init_tier1_luts(); + ff_jpeg2000_init_tier1_luts(); return 0; } diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 7b2653e4be..862b49e612 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1003,7 +1003,7 @@ static av_cold int j2kenc_init(AVCodecContext *avctx) s->chroma_shift, s->chroma_shift + 1); } - ff_j2k_init_tier1_luts(); + ff_jpeg2000_init_tier1_luts(); init_luts(); |