From a57ea1a87e6b65194718968fe0b778e843d4d4b0 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 10 Sep 2011 13:52:33 -0400 Subject: [PATCH] adpcm: simplify reading of IMA DK4 frame header. --- libavcodec/adpcm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index d46ec4aabd..be10f88de8 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -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++;