1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

adpcm: simplify reading of IMA DK4 frame header.

This commit is contained in:
Justin Ruggles 2011-09-10 13:52:33 -04:00
parent 8114f94ac9
commit a57ea1a87e

View File

@ -528,15 +528,12 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
if (avctx->block_align != 0 && buf_size > avctx->block_align)
buf_size = avctx->block_align;
c->status[0].predictor = (int16_t)bytestream_get_le16(&src);
c->status[0].step_index = *src++;
src++;
*samples++ = c->status[0].predictor;
if (st) {
c->status[1].predictor = (int16_t)bytestream_get_le16(&src);
c->status[1].step_index = *src++;
for (channel = 0; channel < avctx->channels; channel++) {
cs = &c->status[channel];
cs->predictor = (int16_t)bytestream_get_le16(&src);
cs->step_index = *src++;
src++;
*samples++ = c->status[1].predictor;
*samples++ = cs->predictor;
}
while (src < buf + buf_size) {
uint8_t v = *src++;