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

Commit 9c322946 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove unused variable"

parents 6eaf18b4 cc0f3289

media/libmedia/CharacterEncodingDetector.cpp

+0 −4
Original line number Diff line number Diff line
@@ -393,10 +393,6 @@ const UCharsetMatch *CharacterEncodingDetector::getPreferred( 
        while (true) {

            // demerit the current encoding for each "special" character found after conversion.

            // The amount of demerit is somewhat arbitrarily chosen.

            int inchar;

            if (source != sourceLimit) {

                inchar = (source[0] << 8) + source[1];

            }

            UChar32 c = ucnv_getNextUChar(conv, &source, sourceLimit, &status);

            if (!U_SUCCESS(status)) {

                break;

media/libmediaplayerservice/StagefrightRecorder.cpp

+0 −4
Original line number Diff line number Diff line
@@ -1254,10 +1254,6 @@ status_t StagefrightRecorder::start() { 
        case OUTPUT_FORMAT_MPEG_4:

        case OUTPUT_FORMAT_WEBM:

        {

            bool isMPEG4 = true;

            if (mOutputFormat == OUTPUT_FORMAT_WEBM) {

                isMPEG4 = false;

            }

            sp<MetaData> meta = new MetaData;

            setupMPEG4orWEBMMetaData(&meta);

            status = mWriter->start(meta.get());