From: Ronald S. Bultje <rsbultje@gmail.com>
Date: Sat, 17 Mar 2012 21:07:20 +0000 (-0700)
Subject: adpcm: convert adpcm_ima_apc to bytestream2.
X-Git-Tag: android-x86-4.4-r1~8529^2~2583
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=74d7ac95fbf4913406a81f85e2f020867e771b0e;p=android-x86%2Fexternal-ffmpeg.git

adpcm: convert adpcm_ima_apc to bytestream2.
---

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 16044d882e..90caf6563a 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -802,8 +802,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
         }
         break;
     case CODEC_ID_ADPCM_IMA_APC:
-        while (src < buf + buf_size) {
-            uint8_t v = *src++;
+        while (bytestream2_get_bytes_left(&gb) > 0) {
+            int v = bytestream2_get_byteu(&gb);
             *samples++ = adpcm_ima_expand_nibble(&c->status[0],  v >> 4  , 3);
             *samples++ = adpcm_ima_expand_nibble(&c->status[st], v & 0x0F, 3);
         }