From 05ea63da2019bf1ed4847b41bda0b9725d3a76df Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Mon, 1 Aug 2011 13:22:26 -0700
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp
index 020e947a9d225..8a42e8b4b0484 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;
     }