summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-06-16 11:46:55 +0200
committerAnton Khirnov <anton@khirnov.net>2016-07-25 13:57:01 +0200
commit2553d1896e8c8b9779f0b73c10bea14a3be615e4 (patch)
tree6f7fb73decaf76624e54086b2f7f1f87ed357732
parent6726bca33cb581a5b2efe7bfe32d47520f615bea (diff)
cfhd: Move data tables into consistent order
-rw-r--r--libavcodec/cfhddata.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/cfhddata.c b/libavcodec/cfhddata.c
index 6bf81b7979..476c788c6e 100644
--- a/libavcodec/cfhddata.c
+++ b/libavcodec/cfhddata.c
@@ -36,19 +36,6 @@
#define TABLE_9_BAND_END3 0x38F0B3Eh
#define TABLE_9_BAND_END_LEN3 26
-static const uint8_t table_9_vlc_len[NB_VLC_TABLE_9] = {
- 1, 2, 4, 5, 5, 5, 6, 6,
- 6, 7, 7, 8, 8, 8, 8, 9,
- 9, 9, 9, 9, 10, 10, 11, 11,
- 11, 11, 12, 12, 12, 12, 13, 13,
- 13, 14, 14, 14, 14, 14, 14, 15,
- 15, 15, 15, 16, 16, 16, 16, 17,
- 17, 17, 17, 17, 18, 18, 18, 19,
- 19, 19, 20, 20, 20, 20, 20, 22,
- 23, 23, 23, 23, 24, 24, 24, 25,
- 26, 26,
-};
-
static const uint32_t table_9_vlc_bits[NB_VLC_TABLE_9] = {
0, 0x2, 0xc, 0x1a,
0x1d, 0x1e, 0x39, 0x3e,
@@ -71,6 +58,19 @@ static const uint32_t table_9_vlc_bits[NB_VLC_TABLE_9] = {
0x38F0B3F, 0x38F0B3E,
};
+static const uint8_t table_9_vlc_len[NB_VLC_TABLE_9] = {
+ 1, 2, 4, 5, 5, 5, 6, 6,
+ 6, 7, 7, 8, 8, 8, 8, 9,
+ 9, 9, 9, 9, 10, 10, 11, 11,
+ 11, 11, 12, 12, 12, 12, 13, 13,
+ 13, 14, 14, 14, 14, 14, 14, 15,
+ 15, 15, 15, 16, 16, 16, 16, 17,
+ 17, 17, 17, 17, 18, 18, 18, 19,
+ 19, 19, 20, 20, 20, 20, 20, 22,
+ 23, 23, 23, 23, 24, 24, 24, 25,
+ 26, 26,
+};
+
static const uint16_t table_9_vlc_run[NB_VLC_TABLE_9] = {
1, 1, 1, 1, 12, 1, 32, 160,
1, 1, 1, 320, 1, 1, 80, 120,