diff options
| author | Marco Nelissen <marcone@google.com> | 2015-10-09 12:10:31 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-10-16 21:31:50 +0000 |
| commit | b3d9f56313f1838649712297ebc8205c4ec14870 (patch) | |
| tree | 6923dc4fc41fd1861891ffdda8b6834d7fb3cc81 | |
| parent | d538baad390c1fe5abb13fe821b4ac3d0006d431 (diff) | |
| download | frameworks_av-b3d9f56313f1838649712297ebc8205c4ec14870.zip frameworks_av-b3d9f56313f1838649712297ebc8205c4ec14870.tar.gz frameworks_av-b3d9f56313f1838649712297ebc8205c4ec14870.tar.bz2 | |
Reconcile with master after mass cherrypicks
Change-Id: I74649c9771212aa6309ea16c253723994b8e3622
| -rw-r--r-- | media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ OMX_ERRORTYPE SoftAVC::initEncoder() { 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)) { |