commit 60ba815e788a2546a30be7f90dea26520e669471
author android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 18:59:14 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 18:59:14 2017 +0000
tree e2160ee2cfe79639bc9eed6a99c728f761fd26e2
parent 45fcb14b365217a32c556828c30606a96301bfbf
parent 32aafab6966944f1aae7bea077818d038680c1c9

Merge cherrypicks of [3072908] into oc-r3-release

Change-Id: Ieb85c3d19bd579246b924b44f5f2ebe6af8dad34

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