commit 9c3229469026f7971fed2b8419afdd56a4416b2a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 05 10:01:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 05 10:01:57 2023 +0000
tree 4107f0d27df87057c1bb68aedb6de1e3e92461cf
parent 6eaf18b4fa2b546cbacef467be26cc8218ec4908
parent cc0f3289519f6fe92f9895564f0ec916f77ea984

Merge "Remove unused variable"

media/libmedia/CharacterEncodingDetector.cpp

diff --git a/media/libmedia/CharacterEncodingDetector.cpp b/media/libmedia/CharacterEncodingDetector.cpp
index 64ba977..e33cc0f 100644
--- a/media/libmedia/CharacterEncodingDetector.cpp
+++ b/media/libmedia/CharacterEncodingDetector.cpp
@@ -393,10 +393,6 @@
         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

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index ec79b99..6f8c102 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1254,10 +1254,6 @@
         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());