diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2012-12-19 22:20:49 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2012-12-19 22:20:49 +0000 |
| commit | 092219a345fc4c32df097ae391b071f494064038 (patch) | |
| tree | 308d222aa9a74366798771eb11530b8e6f3545ce | |
| parent | 28d2a631040e43c700fd2b17f85f44cd76b33936 (diff) | |
| parent | 79181daa729bbfd77c8bf51dbcac8aac1593ccba (diff) | |
| download | src-092219a345fc4c32df097ae391b071f494064038.tar.gz | |
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
| -rw-r--r-- | src/opus_decoder.c | 4 |
1 files changed, 1 insertions, 3 deletions
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 @@ static int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, /* 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; |