aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-07 11:53:09 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-07 11:53:09 +0000
commitb1fbd7a9ca912deb0aa38a58831644530143633e (patch)
tree793a313b277c509563ad6e78a80734680bc70538
parent21159a0654eeb24813bded8ddac4f6e3b18a7e51 (diff)
parentbbb207f5d7dd302bf22a0a004bd4c89d8e4cd559 (diff)
downloadgoldfish-opengl-android14-mainline-conscrypt-release.tar.gz
Snap for 11190379 from bbb207f5d7dd302bf22a0a004bd4c89d8e4cd559 to mainline-conscrypt-releaseaml_con_341410300android14-mainline-conscrypt-release
Change-Id: I1e779e42b987b0e03303584f5cd97d23cf7d9911
-rw-r--r--system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp4
-rw-r--r--system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
index 81366dd6..f9a7a3f5 100644
--- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
+++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
@@ -869,15 +869,15 @@ void C2GoldfishAvcDec::removePts(uint64_t pts) {
if (!mOldPts2Index.empty()) {
auto iter = mOldPts2Index.find(pts);
if (iter != mOldPts2Index.end()) {
- mOldPts2Index.erase(iter);
index = iter->second;
+ mOldPts2Index.erase(iter);
found = true;
}
} else {
auto iter = mPts2Index.find(pts);
if (iter != mPts2Index.end()) {
- mPts2Index.erase(iter);
index = iter->second;
+ mPts2Index.erase(iter);
found = true;
}
}
diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
index 14eed1f6..173dd386 100644
--- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
+++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
@@ -816,15 +816,15 @@ void C2GoldfishHevcDec::removePts(uint64_t pts) {
if (!mOldPts2Index.empty()) {
auto iter = mOldPts2Index.find(pts);
if (iter != mOldPts2Index.end()) {
- mOldPts2Index.erase(iter);
index = iter->second;
+ mOldPts2Index.erase(iter);
found = true;
}
} else {
auto iter = mPts2Index.find(pts);
if (iter != mPts2Index.end()) {
- mPts2Index.erase(iter);
index = iter->second;
+ mPts2Index.erase(iter);
found = true;
}
}