commit 1ae39483064d96d72dcf2c00ea906baf323ff434
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 18 18:21:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 18 18:21:54 2017 +0000
tree 046a40a662e3d44fd4b1762b27777d58344c2b71
parent 493591c1ad323001157b21e52a564e361d15122b
parent 5518a2cd0b5b57901e4cf6fd84cbefd5d613e9ad

Merge "stagefright: fix error code return"

media/extractors/mp4/ItemTable.cpp

diff --git a/media/extractors/mp4/ItemTable.cpp b/media/extractors/mp4/ItemTable.cpp
index f54b405..ed560e1 100644
--- a/media/extractors/mp4/ItemTable.cpp
+++ b/media/extractors/mp4/ItemTable.cpp
@@ -1108,7 +1108,9 @@
         mItemInfos->push_back(itemInfo);
         mHasGrids |= (itemInfo.itemType == FOURCC('g', 'r', 'i', 'd'));
     }
-    return OK;
+    // InfeBox parse returns ERROR_UNSUPPORTED if the box if an unsupported
+    // version. Ignore this error as it's not fatal.
+    return (err == ERROR_UNSUPPORTED) ? OK : err;
 }
 
 //////////////////////////////////////////////////////////////////