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

Commit f13a3fa3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unused variable" am: 9c322946 am: f5c4a1a7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2604425



Change-Id: I68a9f7530fc6c082b6cdf8ae3dcbb9cd4a7e5c26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fad38ca9 f5c4a1a7

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());