aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-06 00:02:59 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-06 00:02:59 +0000
commitcbf6251bf7f0ee3b13f3033604273828538567d0 (patch)
tree1d076c134df3be11c033c5148dece6e325b480d3
parent112cd99277ac073907c7f3c6f978e51eb4a711cd (diff)
parentfe2f6f8eecb7848c533741f9012ddb269dadbbe8 (diff)
downloadgoldfish-opengl-cbf6251bf7f0ee3b13f3033604273828538567d0.tar.gz
Snap for 11180250 from fe2f6f8eecb7848c533741f9012ddb269dadbbe8 to 24Q1-release
Change-Id: Iff105657593344749c510187f97079cf95424afd
-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;
}
}