diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-17 14:35:26 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-18 15:33:15 -0700 |
| commit | 524af484ed68f3a796ec93fe3a1017ca403da628 (patch) | |
| tree | d37fafed11fcfdc0c8ae14398845631a97b758b8 | |
| parent | 8f2ed09289900e563225726ed64c815ab70ff3e7 (diff) | |
| download | ffmpeg-524af484ed68f3a796ec93fe3a1017ca403da628.tar.gz | |
adpcm convert adpcm_ima_ea_sead to bytestream2.
| -rw-r--r-- | libavcodec/adpcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 0a60719fe1..ebeb2dad30 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -860,9 +860,10 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case CODEC_ID_ADPCM_IMA_EA_SEAD: - for (n = nb_samples >> (1 - st); n > 0; n--, src++) { - *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] >> 4, 6); - *samples++ = adpcm_ima_expand_nibble(&c->status[st],src[0]&0x0F, 6); + for (n = nb_samples >> (1 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_expand_nibble(&c->status[0], byte >> 4, 6); + *samples++ = adpcm_ima_expand_nibble(&c->status[st], byte & 0x0F, 6); } break; case CODEC_ID_ADPCM_EA: |