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

Commit 1c2e3113 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Android Git Automerger
Browse files

am 6f3b732b: Merge "Fix wrong int argument of FOURCC." 

* commit '6f3b732b':
  Fix wrong int argument of FOURCC.
parents 9219224e 6f3b732b

media/libstagefright/MPEG4Extractor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1533,13 +1533,13 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
            break;

        }



        // @xyz

        case FOURCC('\xA9', 'x', 'y', 'z'):

        // xyz

        case FOURCC(0xA9, 'x', 'y', 'z'):

        {

            *offset += chunk_size;



            // Best case the total data length inside "@xyz" box

            // would be 8, for instance "@xyz" + "\x00\x04\x15\xc7" + "0+0/",

            // Best case the total data length inside "xyz" box

            // would be 8, for instance "xyz" + "\x00\x04\x15\xc7" + "0+0/",

            // where "\x00\x04" is the text string length with value = 4,

            // "\0x15\xc7" is the language code = en, and "0+0" is a

            // location (string) value with longitude = 0 and latitude = 0.