commit 98eb9ac60a5498e30bd543c1f011bf34091dc99f
author android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 18:40:22 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Oct 16 18:40:22 2017 +0000
tree e2160ee2cfe79639bc9eed6a99c728f761fd26e2
parent 31a729579aeffdf60f4f7de5d2c5fe1dfd161622
parent 58137f26922e67db6692dd399d3076087a6904f6

Merge cherrypicks of [3072906] into oc-release

Change-Id: I32c3e3095026fe9e0bc57922ecdc5f26c39587a0

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