diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-20 10:29:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 10:29:35 -0700 |
| commit | 11623fa3eb2c25ace502fdbdf290e154ac66960e (patch) | |
| tree | 90d1d05ba5c0c714de2a9263acc74b766b3e24c9 /media | |
| parent | 07c6ddb431c784a24a70a5a91d8a454e9c1dde5d (diff) | |
| parent | af5f9f05937521acb4855848d77bed1d4ed7db0a (diff) | |
| download | frameworks_av-11623fa3eb2c25ace502fdbdf290e154ac66960e.zip frameworks_av-11623fa3eb2c25ace502fdbdf290e154ac66960e.tar.gz frameworks_av-11623fa3eb2c25ace502fdbdf290e154ac66960e.tar.bz2 | |
am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit 'af5f9f05937521acb4855848d77bed1d4ed7db0a':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG2TSWriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG2TSWriter.cpp b/media/libstagefright/MPEG2TSWriter.cpp index 217c17a..92f12af 100644 --- a/media/libstagefright/MPEG2TSWriter.cpp +++ b/media/libstagefright/MPEG2TSWriter.cpp @@ -934,7 +934,7 @@ void MPEG2TSWriter::writeAccessUnit( size_t offset = copy; while (offset < accessUnit->size()) { - bool lastAccessUnit = ((accessUnit->size() - offset) < 183); + bool lastAccessUnit = ((accessUnit->size() - offset) < 184); // for subsequent fragments of "buffer": // 0x47 // transport_error_indicator = b0 |