OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
afbbc6c
)
Fail more gracefully on version mismatch
author
Marco Nelissen
<marcone@google.com>
Mon, 29 Jul 2013 18:22:27 +0000
(11:22 -0700)
committer
Marco Nelissen
<marcone@google.com>
Mon, 29 Jul 2013 18:24:29 +0000
(11:24 -0700)
b/
9900647
Change-Id: I9ea508a2685ff8adc780edd5ecec30dd1a9b0997
media/libstagefright/MPEG4Extractor.cpp
patch
|
blob
|
history
diff --git
a/media/libstagefright/MPEG4Extractor.cpp
b/media/libstagefright/MPEG4Extractor.cpp
index
42a9c7a
..
ad985ee
100644
(file)
--- 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);