commit 2c76c56d5612afea04987269f5fa613c19366f12
author Pawin Vongmasa <pawin@google.com> Thu Oct 13 00:59:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 00:59:46 2016 +0000
tree 25e207fae5dd287495642c43ae0fb9fab30dbf96
parent d9f6b22189b7c5d48a5401eb18d31cd243f829b3
parent de84a76b865d1061cfa9012f91b0aed4595f42cf

DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am: de84a76b86

Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b

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.");
           }
       }