commit | 27f4a784abb920fc406be222f136eaaee0a6015a | [log] [tgz] |
---|---|---|
author | Masaichi Toki <masaichi.x.toki@sonymobile.com> | Sun Oct 15 08:47:53 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Oct 15 08:47:53 2017 +0000 |
tree | 1aeaded463c1613a5feae94ba08078950bccbbaa | |
parent | 02cc0ecc732a33a33570ec490c44a686354c512b [diff] | |
parent | 6319db1d31e012c097f48c66a37871cc0e534a91 [diff] |
Merge "Fix ERROR_MALFORMED return in bool method, BetterSniffMPEG4" am: 67b97497e5 am: 0ac1279131 am: 6319db1d31 Change-Id: I902489560f141c368636b63226e83d4f0af40976
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 27599be..5159e59 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -5400,7 +5400,7 @@ off64_t chunkDataSize = chunkSize - (chunkDataOffset - offset); if (chunkDataSize < 0) { ALOGE("b/23540914"); - return ERROR_MALFORMED; + return false; } char chunkstring[5];