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 <mans@mansr.com>
(cherry picked from commit 214a85202b2eedbef06357e40278c2f56aa2c6e3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mans Rullgard 2011-07-16 15:31:41 +01:00 committed by Michael Niedermayer
parent d4999e0a79
commit e40cde01dc

View File

@ -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 */