[FFmpeg-cvslog] adpcm: convert adpcm_yamaha to bytestream2.
Ronald S. Bultje
git at videolan.org
Tue Mar 20 00:16:52 CET 2012
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Mar 17 15:39:16 2012 -0700| [72eda7786da47800065a1fbbe9b8eb31cedcf547] | committer: Ronald S. Bultje
adpcm: convert adpcm_yamaha to bytestream2.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72eda7786da47800065a1fbbe9b8eb31cedcf547
---
libavcodec/adpcm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 877a5ad..49f103e 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1202,8 +1202,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
bytestream2_seek(&gb, 0, SEEK_END);
break;
case CODEC_ID_ADPCM_YAMAHA:
- for (n = nb_samples >> (1 - st); n > 0; n--, src++) {
- uint8_t v = *src;
+ for (n = nb_samples >> (1 - st); n > 0; n--) {
+ int v = bytestream2_get_byteu(&gb);
*samples++ = adpcm_yamaha_expand_nibble(&c->status[0 ], v & 0x0F);
*samples++ = adpcm_yamaha_expand_nibble(&c->status[st], v >> 4 );
}
More information about the ffmpeg-cvslog
mailing list