diff options
| author | Wei Jia <wjia@google.com> | 2014-12-09 00:57:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 00:57:41 +0000 |
| commit | 882687382f3bf2eea0578242e0734e9eb2c0fa73 (patch) | |
| tree | f3cbb1307908bcca0c159b644b7ae151682c8a9d /media/libstagefright/mpeg2ts | |
| parent | f849e1984ae639112e125a91e27098cf0ebc68c1 (diff) | |
| parent | 5185c95673f7c6facd6d57fdc9fc53f52e44eed8 (diff) | |
| download | frameworks_av-882687382f3bf2eea0578242e0734e9eb2c0fa73.zip frameworks_av-882687382f3bf2eea0578242e0734e9eb2c0fa73.tar.gz frameworks_av-882687382f3bf2eea0578242e0734e9eb2c0fa73.tar.bz2 | |
am 5185c956: am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev
* commit '5185c95673f7c6facd6d57fdc9fc53f52e44eed8':
avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index 43f1347..1d8a213 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -343,12 +343,13 @@ status_t ElementaryStreamQueue::appendData( } if (frameLength != size - startOffset) { - ALOGW("got ADTS AAC frame length %zd instead of %zd", + ALOGW("First ADTS AAC frame length is %zd bytes, " + "while the buffer size is %zd bytes.", frameLength, size - startOffset); } data = &ptr[startOffset]; - size = frameLength; + size -= startOffset; #endif break; } |