virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

adpcm convert adpcm_ima_ea_sead to bytestream2.

Browse Source
This commit is contained in:
Ronald S. Bultje 2012-03-17 14:35:26 -07:00
parent 8f2ed09289
commit 524af484ed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/adpcm.c
View File

@ -860,9 +860,10 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
} }
break; break;
case CODEC_ID_ADPCM_IMA_EA_SEAD: case CODEC_ID_ADPCM_IMA_EA_SEAD:
for (n = nb_samples >> (1 - st); n > 0; n--, src++) { for (n = nb_samples >> (1 - st); n > 0; n--) {
*samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] >> 4, 6); int byte = bytestream2_get_byteu(&gb);
*samples++ = adpcm_ima_expand_nibble(&c->status[st],src[0]&0x0F, 6); *samples++ = adpcm_ima_expand_nibble(&c->status[0], byte >> 4, 6);
*samples++ = adpcm_ima_expand_nibble(&c->status[st], byte & 0x0F, 6);
} }
break; break;
case CODEC_ID_ADPCM_EA: case CODEC_ID_ADPCM_EA: