summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-20 09:40:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-20 09:40:13 -0700
commitaf5f9f05937521acb4855848d77bed1d4ed7db0a (patch)
tree6756478f35cfd51b1722cacd2f517f13e27ba586 /media
parent3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a (diff)
parentcd622346235829f60246a061560adf5921ba129c (diff)
downloadframeworks_av-af5f9f05937521acb4855848d77bed1d4ed7db0a.zip
frameworks_av-af5f9f05937521acb4855848d77bed1d4ed7db0a.tar.gz
frameworks_av-af5f9f05937521acb4855848d77bed1d4ed7db0a.tar.bz2
am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit 'cd622346235829f60246a061560adf5921ba129c': MPEG2TSWriter: Fix an off-by-one in the condition for padding
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MPEG2TSWriter.cpp2
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