[FFmpeg-cvslog] j2k: merge ff_j2k_init_tier1_luts()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 26 17:42:25 2013 +0200| [e66faf71eb89e4babcf8d48873768faad7847bcb] | committer: Michael Niedermayer

j2k: merge ff_j2k_init_tier1_luts()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e66faf71eb89e4babcf8d48873768faad7847bcb
---

 libavcodec/j2k.c    |   11 -----------
 libavcodec/j2k.h    |    2 +-
 libavcodec/j2kdec.c |    2 +-
 libavcodec/j2kenc.c |    2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c
index d5591b6..fdd86d5 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 2757621..2c94d05 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 f46628e..034e42b 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 7b2653e..862b49e 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();