commit c5fb338d751b4e6ef88f825764fd0ccae1ccb1a1
author Caroline Tice <cmtice@google.com> Thu Jan 26 20:37:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 20:37:58 2017 +0000
tree 4e2ec0d945dc74b605e8332b6b11b2d8ed5c1080
parent 15222d6ddcd7b15721933a97e79fdd8642af63b8
parent bf8ecdce4cc747f6a9b1143ccd7a2bc2a01b23cf

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

Change-Id: Id09581405df786ae008c3b4d88299b3913228312

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;
   }