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:
177ee22
)
media: Fix a typo in parsing nclc atom.
author
Hangyu Kuang
<hkuang@google.com>
Fri, 19 Aug 2016 20:49:43 +0000
(13:49 -0700)
committer
Marco Nelissen
<marcone@google.com>
Mon, 11 Sep 2017 20:59:35 +0000
(20:59 +0000)
Bug:
30974361
bug:
64836941
Change-Id: I12a75ed30d3259d863e744fae3ccff79d8a95f39
(cherry picked from commit
51a0ff56f49faf1a19281f6d786fe18bf84794c6
)
media/libstagefright/MPEG4Extractor.cpp
patch
|
blob
|
history
diff --git
a/media/libstagefright/MPEG4Extractor.cpp
b/media/libstagefright/MPEG4Extractor.cpp
index
c3a1ab9
..
857ed38
100644
(file)
--- a/
media/libstagefright/MPEG4Extractor.cpp
+++ b/
media/libstagefright/MPEG4Extractor.cpp
@@
-2835,7
+2835,7
@@
status_t MPEG4Extractor::parseColorInfo(off64_t offset, size_t size) {
int32_t type = U32_AT(&buffer[0]);
if ((type == FOURCC('n', 'c', 'l', 'x') && size >= 11)
- || (type == FOURCC('n', 'c', 'l', 'c'
&& size >= 10)
)) {
+ || (type == FOURCC('n', 'c', 'l', 'c'
) && size >= 10
)) {
int32_t primaries = U16_AT(&buffer[4]);
int32_t transfer = U16_AT(&buffer[6]);
int32_t coeffs = U16_AT(&buffer[8]);