commit 2d68f88607f604926fa09478953ef825c4557271
author android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 19:06:59 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 19:06:59 2017 +0000
tree e2160ee2cfe79639bc9eed6a99c728f761fd26e2
parent 48a9b68e039789ce0aa6a748d56c6f822a2b5d28
parent 387b881ff18f5725b0c9c107c27bdc7b76080755

Merge cherrypicks of [3072909] into oc-r2-release

Change-Id: Ia5de5212789189548193af6d8e7571e6a9ee62f5

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 9c096e6..1a1563a 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;
         }
     }