commit a22b5f8aa3bf5a6f00fc85a8dea3662f0f95767f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 05 00:59:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 05 00:59:03 2020 +0000
tree ed9155281029fb333cc18d0f678898f2694d76a9
parent 057c5d3abaac187169e2e735e768787fadee1bf6
parent 72c53046eb024639de3bd4da75603a3189ce2e0d

Merge "Benchmark: Update encoding parameters for SDK and Native encoders" am: 981d06d3c7 am: 72c53046eb

Change-Id: Idecf902a8c517699cc1f7f0f8b513cce084fe47e

media/extractors/mp4/SampleTable.cpp

diff --git a/media/extractors/mp4/SampleTable.cpp b/media/extractors/mp4/SampleTable.cpp
index 9dddf2c..a4d3994 100644
--- a/media/extractors/mp4/SampleTable.cpp
+++ b/media/extractors/mp4/SampleTable.cpp
@@ -655,12 +655,13 @@
     }
 
     mSampleTimeEntries = new (std::nothrow) SampleTimeEntry[mNumSampleSizes];
-    memset(mSampleTimeEntries, 0, sizeof(SampleTimeEntry) * mNumSampleSizes);
+
     if (!mSampleTimeEntries) {
         ALOGE("Cannot allocate sample entry table with %llu entries.",
                 (unsigned long long)mNumSampleSizes);
         return;
     }
+    memset(mSampleTimeEntries, 0, sizeof(SampleTimeEntry) * mNumSampleSizes);
 
     uint32_t sampleIndex = 0;
     uint64_t sampleTime = 0;