diff options
| author | Marco Nelissen <marcone@google.com> | 2013-07-29 20:19:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-29 20:19:01 +0000 |
| commit | ea543db8acfa4885a756903c19c4cf0df5ef76a1 (patch) | |
| tree | 6cf4f3651963d2c9218ab93a19e8d2fa0fb5c22a /media | |
| parent | 2eeca1f8e18106d118f7268cb9d8597539685c5c (diff) | |
| parent | 04022b34d2b97938b0926ab62e6c283418da3bba (diff) | |
| download | frameworks_av-ea543db8acfa4885a756903c19c4cf0df5ef76a1.zip frameworks_av-ea543db8acfa4885a756903c19c4cf0df5ef76a1.tar.gz frameworks_av-ea543db8acfa4885a756903c19c4cf0df5ef76a1.tar.bz2 | |
Merge "Fail more gracefully on version mismatch"
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); |