commit ad554c644af4d7236d3330117e13467cbce3899b
author George Burgess IV <gbiv@google.com> Thu Jan 21 19:30:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 21 19:30:38 2021 +0000
tree c5023355781b3538ca87f8bd611821336c79dd57
parent 9755af671b63ff6cb3c459a418460bd1a5c48ead
parent 759287161e9827cb2bb2167524d91c9011fc92dc

Merge "av: fix static analyzer complaints" am: 9d2dc23f7b am: 759287161e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf0ca20b96cc4c1af98c07aad3cee951bf26b660

media/codecs/amrnb/enc/src/cor_h_x2.cpp

diff --git a/media/codecs/amrnb/enc/src/cor_h_x2.cpp b/media/codecs/amrnb/enc/src/cor_h_x2.cpp
index b4fd867..e32eb4a 100644
--- a/media/codecs/amrnb/enc/src/cor_h_x2.cpp
+++ b/media/codecs/amrnb/enc/src/cor_h_x2.cpp
@@ -240,7 +240,7 @@
     Word16 j;
     Word16 k;
     Word32 s;
-    Word32 y32[L_CODE];
+    Word32 y32[L_CODE]{};
     Word32 max;
     Word32 tot;
 

media/codecs/m4v_h263/enc/src/mp4enc_api.cpp

diff --git a/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp b/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp
index 7ab8f45..d43156c 100644
--- a/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp
+++ b/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp
@@ -1579,7 +1579,7 @@
         if (currLayer == 0)
         {
             video->forwardRefVop = tempForwRefVop; /* For P-Vop base only */
-            video->forwardRefVop->refSelectCode = tempRefSelCode;
+            if (video->forwardRefVop != NULL) video->forwardRefVop->refSelectCode = tempRefSelCode;
         }
 
         return status;