diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-07-16 15:31:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 20:46:56 +0200 |
| commit | e40cde01dcd7b173c97fd4104f896893726343f1 (patch) | |
| tree | c925a9e5f3000d471adcd987d5f542be4ebe5687 /libavcodec | |
| parent | d4999e0a798cc82db212be67d9edb22f0a7e5847 (diff) | |
| download | ffmpeg-e40cde01dcd7b173c97fd4104f896893726343f1.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vorbis_enc_data.h | 12 |
1 files 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 */ |