commit e03276439f2933e2d7f2d717f28b2d8469eaeb93
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 05 21:33:23 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 05 21:33:23 2020 +0000
tree c686865e5218dd7dc7fbb18b864517725b90a92a
parent 0eb9bb9cbee76a0ceeec9920f695495a46e14ff9
parent e29b3425d0623a58f2b6aa813f1bd76d15defccb

Merge "Reserve item ids for samples + grid" into rvc-qpr-dev

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 8f7d4bf..d99596e 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2774,7 +2774,7 @@
         // even if the file is well-formed and the primary picture is correct.
 
         // Reserve item ids for samples + grid
-        size_t numItemsToReserve = mNumTiles + (mNumTiles > 1);
+        size_t numItemsToReserve = mNumTiles + (mNumTiles > 0);
         status_t err = mOwner->reserveItemId_l(numItemsToReserve, &mItemIdBase);
         if (err != OK) {
             return err;