commit 9d2dc23f7b5451cfdff82e9b63756da35336a7d8
author George Burgess IV <gbiv@google.com> Thu Jan 21 18:31:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 21 18:31:14 2021 +0000
tree 914024b3adf02cee626bf90f1b72116f0327499f
parent e392f2cf6356eeb5269df852cca49b6f0d7716e1
parent 08464604642675b3dcbc7cfc7a7f793f115ec548

Merge "av: fix static analyzer complaints"

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;