commit 18dc831e6675f851a06bd3c79db4e3f6978c2105
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 02 05:26:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 02 05:26:11 2017 +0000
tree 6521590b8b990791c7aaf99879715549096589e1
parent 9a6b9ed394c3ece622029ce5c169f19fd55de5b3
parent bf063732ccaadd049448b5da0f65b84ffdf41b2f

Merge "Fix "Dereference of null pointer" compiler warning."

media/libstagefright/codecs/aacenc/src/dyn_bits.c

diff --git a/media/libstagefright/codecs/aacenc/src/dyn_bits.c b/media/libstagefright/codecs/aacenc/src/dyn_bits.c
index 4d763d0..e75b48f 100644
--- a/media/libstagefright/codecs/aacenc/src/dyn_bits.c
+++ b/media/libstagefright/codecs/aacenc/src/dyn_bits.c
@@ -20,6 +20,10 @@
 
 *******************************************************************************/
 
+#define LOG_TAG "NoiselessCoder"
+
+#include "log/log.h"
+
 #include "aac_rom.h"
 #include "dyn_bits.h"
 #include "bit_cnt.h"
@@ -296,6 +300,9 @@
     case SHORT_WINDOW:
       sideInfoTab = sideInfoTabShort;
       break;
+    default:
+      ALOGE("invalid blockType: %d", blockType);
+      return;
   }