Module: libav Branch: master Commit: ba5d2890d735961f1e4e8484082287a552cad699
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Sat Sep 10 14:21:39 2011 -0400 adpcm: simplify reading of Funcom ISS frame header. --- libavcodec/adpcm.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 80dc7ca..e4e0627 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -593,13 +593,11 @@ static int adpcm_decode_frame(AVCodecContext *avctx, } break; case CODEC_ID_ADPCM_IMA_ISS: - c->status[0].predictor = (int16_t)AV_RL16(src + 0); - c->status[0].step_index = src[2]; - src += 4; - if(st) { - c->status[1].predictor = (int16_t)AV_RL16(src + 0); - c->status[1].step_index = src[2]; - src += 4; + for (channel = 0; channel < avctx->channels; channel++) { + cs = &c->status[channel]; + cs->predictor = (int16_t)bytestream_get_le16(&src); + cs->step_index = *src++; + src++; } while (src < buf + buf_size) { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
