commit 2f5ed1bf151cc2cc8de7304bdaeed8e48ed99dac
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 14 16:21:25 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 14 16:21:25 2023 +0000
tree 6512854efcd1a580ae384d79176b5fd1456a4ef9
parent fa60bc6503061c89e1c58dedbbfbb54f95ab5df8
parent df0fde4038e05d1f659960b5b04f2ebe187f80a1

Snap for 11219529 from df0fde4038e05d1f659960b5b04f2ebe187f80a1 to mainline-tzdata4-release

Change-Id: Id1694af549028093f2187f90a95cd0632b1fcd4d

system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp

diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
index cbc7069..3a25f7a 100644
--- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
+++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
@@ -860,15 +860,15 @@
     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;
         }
     }

system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp

diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
index 13e9515..adf6ce7 100644
--- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
+++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
@@ -809,15 +809,15 @@
     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;
         }
     }