commit f4224d48929fcd5bb858a25f7e3246b9cdb4cc35
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Jun 03 06:39:22 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 03 06:39:22 2022 +0000
tree 2499fce1c1c03c89046c35d65c37bebd6555e827
parent 43d97341c5c02aa0a9e14bdcdf951ca6199cc1f1
parent 80f2732e4eb6ff1bacf6d0434a5e2dfb7ec67209

[automerger skipped] c2 vp9, av1: List P010 in color formats only if it is supported am: 89d5b5a97f -s ours am: b404b9e481 -s ours am: 80f2732e4e -s ours

am skip reason: Merged-In Iee516a1d45ab82308e74fe6941be748a12bab8af with SHA-1 f5dec500d5 is already in history

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

Change-Id: I1cd829976822d3fad5d658018d357400430a2a20
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;
 }