commit 9ea5908d386e0ac482b025bc3235d9eb71d77e06
author Andreas Huber <andih@google.com> Mon Aug 01 13:26:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 01 13:26:11 2011 -0700
tree 9c1a7722cbd18fae97726ab2543df6c24063fd7f
parent 20f725ebcef13ded1b4b85c61c8a4b37cd030656
parent 7f048fdd69753e0ba95d3ef1484b30bcf39164c0

Merge "Fix NALU extraction of unit starts with a 0x00 nalType"

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;
     }