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

Commit b700593c authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "heic content_encoding field is optional" into pi-dev 

am: dc9df6a1

Change-Id: I1efe71f46a9d2301660195f5665a88e0bf4899a5
parents 14229c56 dc9df6a1

media/extractors/mp4/ItemTable.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1058,10 +1058,13 @@ status_t InfeBox::parse(off64_t offset, size_t size, ItemInfo *itemInfo) { 
                return ERROR_MALFORMED;

            }



            // content_encoding is optional; can be omitted if would be empty

            if (size > 0) {

                String8 content_encoding;

                if (!parseNullTerminatedString(&offset, &size, &content_encoding)) {

                    return ERROR_MALFORMED;

                }

            }

        } else if (item_type == FOURCC('u', 'r', 'i', ' ')) {

            String8 item_uri_type;

            if (!parseNullTerminatedString(&offset, &size, &item_uri_type)) {