| commit | b3d9f56313f1838649712297ebc8205c4ec14870 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Oct 09 12:10:31 2015 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Fri Oct 16 21:31:50 2015 +0000 |
| tree | 6923dc4fc41fd1861891ffdda8b6834d7fb3cc81 | |
| parent | d538baad390c1fe5abb13fe821b4ac3d0006d431 [diff] |
Reconcile with master after mass cherrypicks Change-Id: I74649c9771212aa6309ea16c253723994b8e3622
diff --git a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp index 6e55034..387d17d 100644 --- a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp +++ b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
@@ -637,6 +637,7 @@ for (size_t i = 0; i < MAX_CONVERSION_BUFFERS; i++) { if (mConversionBuffers[i] != NULL) { free(mConversionBuffers[i]); + mConversionBuffers[i] = 0; } if (((uint64_t)mStride * mHeight) > ((uint64_t)INT32_MAX / 3)) {