commit 8ef01d355a5c568d22c395a1e53dea5765d7b37c
author android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 20:45:28 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 20:45:28 2017 +0000
tree bb12ae2b3ee132d28be27f00f17ee99f231e58ee
parent 4d673e8a249c94fda3b175c5dc195a2917b1cca4
parent 25eb924629a5766147f896414794da167d558720

Merge cherrypicks of [3074410] into oc-dr1-release

Change-Id: I3a4be4ed2d7644805cfe32374c503bd16887bc97

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;
         }
     }