commit | a8642245ea1c0b7bdc252fb18117cb6a051a206f | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Fri Aug 04 21:29:43 2017 +0000 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Aug 04 21:29:43 2017 +0000 |
tree | 88b666c4503639da9c238ea554c9113873a3b846 | |
parent | 165d2265ddf604c8e64424532709c4e647af5d0f [diff] | |
parent | 93d36fa09750a511d5429b780325024ef930dc03 [diff] |
Merge cherrypicks of [2666762] into nyc-mr1-volantis-release Change-Id: I10b4e63bf5043b7bfdb3cd35665fae68381a50f4
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 1dfa868..2cc43c1 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3795,7 +3795,8 @@ while (true) { if (mDataSource->readAt(*offset, hdr, 8) < 8) { - return ERROR_END_OF_STREAM; + // no more box to the end of file. + break; } chunk_size = ntohl(hdr[0]); chunk_type = ntohl(hdr[1]);