| commit | a8b90d6aad1231c1cdbdbf5dbb3aa5cd6de76f18 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 21:54:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 21:54:25 2020 +0000 |
| tree | ededa96b40867750a6fca6209fb9893b3ec0780b | |
| parent | 9585fa95cc06988974c10e569f2990b62373efec [diff] | |
| parent | e03276439f2933e2d7f2d717f28b2d8469eaeb93 [diff] |
Merge "Reserve item ids for samples + grid" into rvc-qpr-dev am: e03276439f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12306947 Change-Id: Ifd7a295b7f23ef19cf7a3bdbc05cf82e29e1d5ac
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;