diff options
| author | Marco Nelissen <marcone@google.com> | 2013-07-29 11:22:27 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2013-07-29 11:24:29 -0700 |
| commit | 04022b34d2b97938b0926ab62e6c283418da3bba (patch) | |
| tree | e47f6b41a13c7c49ae7e5640c0a0d9543f6f2e2e /media | |
| parent | afbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d (diff) | |
| download | frameworks_av-04022b34d2b97938b0926ab62e6c283418da3bba.zip frameworks_av-04022b34d2b97938b0926ab62e6c283418da3bba.tar.gz frameworks_av-04022b34d2b97938b0926ab62e6c283418da3bba.tar.bz2 | |
Fail more gracefully on version mismatch
b/9900647
Change-Id: I9ea508a2685ff8adc780edd5ecec30dd1a9b0997
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 42a9c7a..ad985ee 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1924,13 +1924,13 @@ status_t MPEG4Extractor::parseTrackHeader( mtime = U64_AT(&buffer[12]); id = U32_AT(&buffer[20]); duration = U64_AT(&buffer[28]); - } else { - CHECK_EQ((unsigned)version, 0u); - + } else if (version == 0) { ctime = U32_AT(&buffer[4]); mtime = U32_AT(&buffer[8]); id = U32_AT(&buffer[12]); duration = U32_AT(&buffer[20]); + } else { + return ERROR_UNSUPPORTED; } mLastTrack->meta->setInt32(kKeyTrackID, id); |