diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:48:53 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:48:53 +0200 |
| commit | daedfa72541cd14b94e07a88d057af605c1f8202 (patch) | |
| tree | 4b95f5e7af11e319cc29a447517e478214355120 /libavcodec/gsmdec_template.c | |
| parent | 0501305e38adbcbec73c64505d14a1c7fdeb83b1 (diff) | |
| parent | 81f769fa129edc51c28285649c2df6da717e718f (diff) | |
| download | ffmpeg-daedfa72541cd14b94e07a88d057af605c1f8202.tar.gz | |
Merge commit '81f769fa129edc51c28285649c2df6da717e718f'
* commit '81f769fa129edc51c28285649c2df6da717e718f':
gsm: Move requant_tab table to the gsm tables file
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/gsmdec_template.c')
| -rw-r--r-- | libavcodec/gsmdec_template.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/gsmdec_template.c b/libavcodec/gsmdec_template.c index 4cb777c854..9b3c0e9719 100644 --- a/libavcodec/gsmdec_template.c +++ b/libavcodec/gsmdec_template.c @@ -28,13 +28,6 @@ #include "gsm.h" #include "gsmdec_data.h" -static const int requant_tab[4][8] = { - { 0 }, - { 0, 7 }, - { 0, 2, 5, 7 }, - { 0, 1, 2, 3, 4, 5, 6, 7 } -}; - static void apcm_dequant_add(GetBitContext *gb, int16_t *dst, const int *frame_bits) { int i, val; @@ -42,7 +35,7 @@ static void apcm_dequant_add(GetBitContext *gb, int16_t *dst, const int *frame_b const int16_t *tab = ff_gsm_dequant_tab[maxidx]; for (i = 0; i < 13; i++) { val = get_bits(gb, frame_bits[i]); - dst[3*i] += tab[requant_tab[frame_bits[i]][val]]; + dst[3 * i] += tab[ff_gsm_requant_tab[frame_bits[i]][val]]; } } |