summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/avc_utils.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-08-01 13:22:26 -0700
committerAndreas Huber <andih@google.com>2011-08-01 13:22:26 -0700
commit7f048fdd69753e0ba95d3ef1484b30bcf39164c0 (patch)
tree5888127cf6b43f7d9d9814212e652db1176d47c3 /media/libstagefright/avc_utils.cpp
parentb7c5f8fa2ee707f010b60ff7bea07c2bf1e17e2d (diff)
downloadframeworks_av-7f048fdd69753e0ba95d3ef1484b30bcf39164c0.zip
frameworks_av-7f048fdd69753e0ba95d3ef1484b30bcf39164c0.tar.gz
frameworks_av-7f048fdd69753e0ba95d3ef1484b30bcf39164c0.tar.bz2
Fix NALU extraction of unit starts with a 0x00 nalType
by not backing up beyond the start of the nal unit. Change-Id: I5fba9913202de416e634e5f39181be62b72b2469 related-to-bug: 4770290
Diffstat (limited to 'media/libstagefright/avc_utils.cpp')
-rw-r--r--media/libstagefright/avc_utils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp
index 020e947..8a42e8b 100644
--- a/media/libstagefright/avc_utils.cpp
+++ b/media/libstagefright/avc_utils.cpp
@@ -188,7 +188,7 @@ status_t getNextNALUnit(
}
size_t endOffset = offset - 2;
- while (data[endOffset - 1] == 0x00) {
+ while (endOffset > startOffset + 1 && data[endOffset - 1] == 0x00) {
--endOffset;
}