commit 4b2fe7bdeb40e88cd77810059acf9ec8bf4783f8
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 31 21:30:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 31 21:30:16 2022 +0000
tree 4c64e2dd0cee55c64d4579b81413b10e9029f997
parent 158056e62957d84df5eb882b25e8fc23b45542b9
parent 88455e7b2e4bee307150be21fdff165d825280b8

[automerger skipped] Merge "CCodecConfig: map KEY_HDR10_PLUS_INFO to C2StreamHdrDynamicMetadataInfo" am: 068659a57c am: 44689f488b -s ours am: f2310311f7 -s ours am: 88455e7b2e -s ours

am skip reason: Merged-In Id62fab8eea28712084a7c39fe7db2da193481ded with SHA-1 65b9be6991 is already in history

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

Change-Id: I0e651fc64a0b05879771c78d2d02409e7d7e99e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libstagefright/HevcUtils.cpp

diff --git a/media/libstagefright/HevcUtils.cpp b/media/libstagefright/HevcUtils.cpp
index 5f9c20e..60df162 100644
--- a/media/libstagefright/HevcUtils.cpp
+++ b/media/libstagefright/HevcUtils.cpp
@@ -102,10 +102,11 @@
 static bool findParam(uint32_t key, T *param,
         KeyedVector<uint32_t, uint64_t> &params) {
     CHECK(param);
-    if (params.indexOfKey(key) < 0) {
+    ssize_t index = params.indexOfKey(key);
+    if (index < 0) {
         return false;
     }
-    *param = (T) params[key];
+    *param = (T) params[index];
     return true;
 }