commit 7f048fdd69753e0ba95d3ef1484b30bcf39164c0
author Andreas Huber <andih@google.com> Mon Aug 01 13:22:26 2011 -0700
committer Andreas Huber <andih@google.com> Mon Aug 01 13:22:26 2011 -0700
tree 5888127cf6b43f7d9d9814212e652db1176d47c3
parent b7c5f8fa2ee707f010b60ff7bea07c2bf1e17e2d

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

media/libstagefright/avc_utils.cpp

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 @@
     }
 
     size_t endOffset = offset - 2;
-    while (data[endOffset - 1] == 0x00) {
+    while (endOffset > startOffset + 1 && data[endOffset - 1] == 0x00) {
         --endOffset;
     }