commit b39f30b0a4902ea0f28454885785da4b2629fe25
author Eino-Ville Talvala <etalvala@google.com> Tue Feb 26 01:40:39 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 26 01:40:39 2013 +0000
tree c4042ba7bf201f8d4ac726e876f30cc168f0d032
parent b4ac0ea6c45c04ac3e69d6b2243cfec58e858495
parent ceb388d6c03c38b96dc41c0ea4804b749aa077c4

am ceb388d6: CameraService and Stagefright: Support AppOps

* commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4':
  CameraService and Stagefright: Support AppOps

media/libstagefright/mpeg2ts/ESQueue.cpp

diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 82fb637..9499712 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -536,7 +536,7 @@
     size_t nalSize;
     bool foundSlice = false;
     while ((err = getNextNALUnit(&data, &size, &nalStart, &nalSize)) == OK) {
-        CHECK_GT(nalSize, 0u);
+        if (nalSize == 0) continue;
 
         unsigned nalType = nalStart[0] & 0x1f;
         bool flush = false;