summaryrefslogtreecommitdiff
path: root/libavcodec/adpcm.c
diff options
context:
space:
mode:
authorStefan Gehrer <stefan.gehrer@gmx.de>2009-01-30 20:39:39 +0000
committerStefan Gehrer <stefan.gehrer@gmx.de>2009-01-30 20:39:39 +0000
commit8915009813620bce955e561f8f1726532c2fa446 (patch)
treed6a581308680f653e1a86d44b4fc97f2b436f84d /libavcodec/adpcm.c
parent63cae55d622c791fa61ba5541ad02d70ffe5db2a (diff)
remove duplicate tables
Originally committed as revision 16866 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/adpcm.c')
-rw-r--r--libavcodec/adpcm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 87f4f4448f..22ebde29a1 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -107,11 +107,6 @@ static const int ea_adpcm_table[] = {
3, 4, 7, 8, 10, 11, 0, -1, -3, -4
};
-static const int ct_adpcm_table[8] = {
- 0x00E6, 0x00E6, 0x00E6, 0x00E6,
- 0x0133, 0x0199, 0x0200, 0x0266
-};
-
// padded to zero where table size is less then 16
static const int swf_index_tables[4][16] = {
/*2*/ { -1, 2 },
@@ -759,7 +754,7 @@ static inline short adpcm_ct_expand_nibble(ADPCMChannelStatus *c, char nibble)
c->predictor = ((c->predictor * 254) >> 8) + (sign ? -diff : diff);
c->predictor = av_clip_int16(c->predictor);
/* calculate new step and clamp it to range 511..32767 */
- new_step = (ct_adpcm_table[nibble & 7] * c->step) >> 8;
+ new_step = (AdaptationTable[nibble & 7] * c->step) >> 8;
c->step = av_clip(new_step, 511, 32767);
return (short)c->predictor;