From 6a495e986fa4f88ba000bd004b671ae041ebd4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 25 Jan 2011 00:36:19 +0100 Subject: [PATCH] Make inter_rvlc and intra_rvlc static tables. Signed-off-by: Ronald S. Bultje (cherry picked from commit 84ae8936f642042fe7ad3466ce3a26dec77016f1) --- libavcodec/mpeg4data.h | 4 ++-- libavcodec/mpeg4video.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index bef5f8804b..1f4e578ca1 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -115,7 +115,7 @@ RLTable ff_mpeg4_rl_intra = { }; /* Note this is identical to the intra rvlc except that it is reordered. */ -const uint16_t inter_rvlc[170][2]={ +static const uint16_t inter_rvlc[170][2]={ {0x0006, 3},{0x0001, 4},{0x0004, 5},{0x001C, 7}, {0x003C, 8},{0x003D, 8},{0x007C, 9},{0x00FC, 10}, {0x00FD, 10},{0x01FC, 11},{0x01FD, 11},{0x03FC, 12}, @@ -219,7 +219,7 @@ RLTable rvlc_rl_inter = { inter_rvlc_level, }; -const uint16_t intra_rvlc[170][2]={ +static const uint16_t intra_rvlc[170][2]={ {0x0006, 3},{0x0007, 3},{0x000A, 4},{0x0009, 5}, {0x0014, 6},{0x0015, 6},{0x0034, 7},{0x0074, 8}, {0x0075, 8},{0x00DD, 9},{0x00EC, 9},{0x01EC, 10}, diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index aab32364e5..96db36683e 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -66,10 +66,7 @@ extern const uint16_t ff_mpeg4_intra_vlc[103][2]; extern RLTable ff_mpeg4_rl_intra; /* Note this is identical to the intra rvlc except that it is reordered. */ -extern const uint16_t inter_rvlc[170][2]; extern RLTable rvlc_rl_inter; - -extern const uint16_t intra_rvlc[170][2]; extern RLTable rvlc_rl_intra; extern const uint16_t sprite_trajectory_tab[15][2];