commit 092219a345fc4c32df097ae391b071f494064038
author Android Chromium Automerger <chromium-automerger@android> Wed Dec 19 22:20:49 2012 +0000
committer Android Chromium Automerger <chromium-automerger@android> Wed Dec 19 22:20:49 2012 +0000
tree 308d222aa9a74366798771eb11530b8e6f3545ce
parent 28d2a631040e43c700fd2b17f85f44cd76b33936
parent 79181daa729bbfd77c8bf51dbcac8aac1593ccba

Merge third_party/opus/src from https://chromium.googlesource.com/chromium/deps/opus.git at 79181daa729bbfd77c8bf51dbcac8aac1593ccba

This commit was generated by merge_from_chromium.py.

Change-Id: I0eb1ff44299839e3e1e62d37a75281e747065545

src/opus_decoder.c

diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index 161bd02..f0188cd 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -612,16 +612,14 @@
       /* Padding flag is bit 6 */
       if (ch&0x40)
       {
-         int padding=0;
          int p;
          do {
             if (len<=0)
                return OPUS_INVALID_PACKET;
             p = *data++;
             len--;
-            padding += p==255 ? 254: p;
+            len -= p==255 ? 254: p;
          } while (p==255);
-         len -= padding;
       }
       if (len<0)
          return OPUS_INVALID_PACKET;