commit bf8ecdce4cc747f6a9b1143ccd7a2bc2a01b23cf
author Caroline Tice <cmtice@google.com> Thu Jan 26 20:28:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 20:28:51 2017 +0000
tree d9faad464bff9cd7363f94e267b28fe21234b50d
parent 5ffdae08b5c91cc77b1c6964ef32565e188af8d1
parent d2862051d08ac0dd92f1b142625576b88545af80

Merge "Fix "Dereference of null pointer" compiler warning."
am: d2862051d0

Change-Id: Icb470344054623197d204d8666941e5d58ea0c06

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..f0f7cbc 100644
--- a/media/libstagefright/codecs/aacenc/src/dyn_bits.c
+++ b/media/libstagefright/codecs/aacenc/src/dyn_bits.c
@@ -20,11 +20,15 @@
 
 *******************************************************************************/
 
+#include "android/log.h"
+
 #include "aac_rom.h"
 #include "dyn_bits.h"
 #include "bit_cnt.h"
 #include "psy_const.h"
 
+#define LOG_TAG "NoiselessCoder"
+
 /*****************************************************************************
 *
 * function name: buildBitLookUp
@@ -296,6 +300,9 @@
     case SHORT_WINDOW:
       sideInfoTab = sideInfoTabShort;
       break;
+    default:
+      ALOGE("invalid blockType: %d", blockType);
+      return;
   }