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

Commit a35c0dcf authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "media: temporarily allow <Included> as top-level media_codecs.xml tag" into qt-dev 

am: 9794a843

Change-Id: I06a4c6b6c4b60ebe3b6620228925cb293447b46e
parents 44aa3d33 9794a843

media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ void MediaCodecsXmlParser::Impl::Parser::startElementHandler( 
                nextSection = SECTION_ENCODERS;

            } else if (strEq(name, "Settings")) {

                nextSection = SECTION_SETTINGS;

            } else if (strEq(name, "MediaCodecs")) {

            } else if (strEq(name, "MediaCodecs") || strEq(name, "Included")) {

                return;

            } else {

                break;