commit d6768a3f03883e281669e4931f73d3367927c709
author Marco Nelissen <marcone@google.com> Wed Sep 13 20:08:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 13 20:08:06 2017 +0000
tree b95e0f5b208e138df93b41af6801b67a2ca06d4a
parent 74f84d987be37b971f02eb0b4d824599626a9936
parent 08ef71975b37749b3dfb08c74089bb93c1ab8871

Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
am: 08ef71975b

Change-Id: I73ec3365c21238f7ca328763df52121b43911e04

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 905c0ab..8820b7d 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2923,7 +2923,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]);