commit | 92b01549f05ab42c1bc5e1f11aa13d5cf95b7817 | [log] [tgz] |
---|---|---|
author | Masaichi Toki <masaichi.x.toki@sonymobile.com> | Sun Oct 15 08:49:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Oct 15 08:49:28 2017 +0000 |
tree | 062682c27a7f7daca391f614a926b16732bc82f3 | |
parent | b06c38687a0ecf8f5662c916e6e98d21d141eb13 [diff] | |
parent | 27f4a784abb920fc406be222f136eaaee0a6015a [diff] |
Merge "Fix ERROR_MALFORMED return in bool method, BetterSniffMPEG4" am: 67b97497e5 am: 0ac1279131 am: 6319db1d31 am: 27f4a784ab Change-Id: I0f64810dccd1ca380a82edd1e1751a771374cb2b
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index 502c7cf..1c0516d 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -5401,7 +5401,7 @@ off64_t chunkDataSize = chunkSize - (chunkDataOffset - offset); if (chunkDataSize < 0) { ALOGE("b/23540914"); - return ERROR_MALFORMED; + return false; } char chunkstring[5];