commit 2a2b768e903fb69d9d83963834af571e8dd13276
author Lajos Molnar <lajos@google.com> Fri Feb 12 23:10:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 12 23:10:09 2016 +0000
tree dcbe18bf468dfacdf077bea7387af4bb47907fb2
parent 28b86916ebd70841594a505fc79bd9fd908fda70
parent e33d922fd86699c664a15f09e6d8b2e422736a40

Merge "stagefright: don't use allocateBuffer for encoder metadata mode" into nyc-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index aab4fea..5f13ebc 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -834,8 +834,7 @@
                         ? kRequiresAllocateBufferOnInputPorts
                         : kRequiresAllocateBufferOnOutputPorts;
 
-                if ((portIndex == kPortIndexInput && (mFlags & kFlagIsSecure))
-                        || (portIndex == kPortIndexOutput && usingMetadataOnEncoderOutput())) {
+                if (portIndex == kPortIndexInput && (mFlags & kFlagIsSecure)) {
                     mem.clear();
 
                     void *ptr;