diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-11 12:43:03 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-30 18:15:53 -0400 |
| commit | 5a54d5101780421cdcb71c018eea157e3d4d3c8f (patch) | |
| tree | e1346c806c8fefc4115c47f7afc02b7f28d0a3d7 | |
| parent | f47f7efd14fa57e298886a20920b7679c975afc1 (diff) | |
| download | ffmpeg-5a54d5101780421cdcb71c018eea157e3d4d3c8f.tar.gz | |
dpcm: use sol_table_16 directly instead of through the DPCMContext.
| -rw-r--r-- | libavcodec/dpcm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index 3ddc676a72..2491292984 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -146,7 +146,6 @@ static av_cold int dpcm_decode_init(AVCodecContext *avctx) s->sample[0] = s->sample[1] = 0x80; break; case 3: - s->sol_table = sol_table_16; break; default: av_log(avctx, AV_LOG_ERROR, "Unknown SOL subcodec\n"); @@ -297,8 +296,8 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, } else { while (buf < buf_end) { uint8_t n = *buf++; - if (n & 0x80) s->sample[ch] -= s->sol_table[n & 0x7F]; - else s->sample[ch] += s->sol_table[n & 0x7F]; + if (n & 0x80) s->sample[ch] -= sol_table_16[n & 0x7F]; + else s->sample[ch] += sol_table_16[n & 0x7F]; s->sample[ch] = av_clip_int16(s->sample[ch]); *output_samples++ = s->sample[ch]; /* toggle channel */ |