From e40cde01dcd7b173c97fd4104f896893726343f1 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 16 Jul 2011 15:31:41 +0100 Subject: vorbisenc: simplify floor_classes[] table This avoids an indirection in the table. Data size is slightly smaller on 64-bit systems, 8 bytes larger on 32-bit. Signed-off-by: Mans Rullgard (cherry picked from commit 214a85202b2eedbef06357e40278c2f56aa2c6e3) Signed-off-by: Michael Niedermayer --- libavcodec/vorbis_enc_data.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h index affc3d6c86..a51aaec978 100644 --- a/libavcodec/vorbis_enc_data.h +++ b/libavcodec/vorbis_enc_data.h @@ -492,13 +492,13 @@ static const struct { int dim; int subclass; int masterbook; - const int *nbooks; + const int nbooks[4]; } floor_classes[] = { - { 3, 0, 0, (const int[]){ 4 } }, - { 4, 1, 0, (const int[]){ 5, 6 } }, - { 3, 1, 1, (const int[]){ 7, 8 } }, - { 4, 2, 2, (const int[]){ -1, 9, 10, 11 } }, - { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } }, + { 3, 0, 0, { 4 } }, + { 4, 1, 0, { 5, 6 } }, + { 3, 1, 1, { 7, 8 } }, + { 4, 2, 2, { -1, 9, 10, 11 } }, + { 3, 2, 3, { -1, 12, 13, 14 } }, }; #endif /* AVCODEC_VORBIS_ENC_DATA_H */ -- cgit v1.2.3