commit 8caef852351b04b69e0962277f97166142535867
author Pawin Vongmasa <pawin@google.com> Thu Oct 13 00:47:33 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 00:47:33 2016 +0000
tree 25e207fae5dd287495642c43ae0fb9fab30dbf96
parent afb20c310207aa4380f0578545ffce993ded23da
parent de84a76b865d1061cfa9012f91b0aed4595f42cf

Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 7a64c20..d12cafa 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1066,8 +1066,10 @@
         if (err != OK) {
               ALOGE("[%s] storeMetaDataInBuffers (input) failed w/ err %d",
                     mComponentName.c_str(), err);
-
-              return err;
+              if (mOMX->livesLocally(mNode, getpid())) {
+                  return err;
+              }
+              ALOGI("ignoring failure to use internal MediaCodec key.");
           }
       }