commit 944919cb510ef95b0f483370016b56a5f6a7c2ed
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 05 02:13:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 05 02:13:08 2020 +0000
tree a11f9f8e09ae344c9942f1f40e21f3cf218a22ec
parent a22b5f8aa3bf5a6f00fc85a8dea3662f0f95767f
parent fefe8e8e6e7d4a3c7dc8670e48607691156b902f

Merge "Benchmark: Update EOS condition for SDK encoder" am: 5b16d6b28d am: fefe8e8e6e

Change-Id: I95eb36e55629a6cb9ae040a0f5bd345479a06fff

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;