commit 7a5273a991291eae6242072cb0e5fe63d2867123
author Hangyu Kuang <hkuang@google.com> Fri Aug 19 13:49:43 2016 -0700
committer Nikoli Cartagena <dargeren@google.com> Wed Sep 20 12:15:08 2017 -0700
tree 851f816dab19452ddbe1cd077247bed6d6e7cb38
parent 1901efb1441cebb971aea81b7ee643c1c70eca45

media: Fix a typo in parsing nclc atom.

Bug: 30974361
bug: 64836941
Change-Id: I12a75ed30d3259d863e744fae3ccff79d8a95f39
(cherry picked from commit 51a0ff56f49faf1a19281f6d786fe18bf84794c6)
(cherry picked from commit 920ae0ea641146cc158eacdc1f7a164843fe97eb)

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index ed8deb2..2037923 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2922,7 +2922,7 @@
 
     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]);