From b3d9f56313f1838649712297ebc8205c4ec14870 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Fri, 9 Oct 2015 12:10:31 -0700
Subject: Reconcile with master after mass cherrypicks

Change-Id: I74649c9771212aa6309ea16c253723994b8e3622
---
 media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'media')

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)) {
-- 
cgit v1.1