Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57f45439 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

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

Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef7197 am: d6768a3f am: 6705aadd
am: 04cb1d7f

Change-Id: Ib2773de7e003ab14d18e5b8c8f70e4800e0cfc63
parents 8cad7241 04cb1d7f

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2922,7 +2922,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]);