commit 00414f45148879b86424e52d57792a064a48ae38
author android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 20:44:21 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 20:44:21 2017 +0000
tree bb12ae2b3ee132d28be27f00f17ee99f231e58ee
parent 0dcb748cdd08261032b44727b1f1b20fce17f0d7
parent 1822961a6194b65fa85b24a242a0ffb15797fc8b

Merge cherrypicks of [3074405] into oc-dr3-release

Change-Id: Ia2cb71fc1d5a647a565c6311ce80f1de08e905db

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 3608bad..a14d05e 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4624,8 +4624,6 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
-            mBuffer->release();
-            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }
@@ -4918,8 +4916,6 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
-            mBuffer->release();
-            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }