commit 721468e7794383c33fca850803401acb195c2c2c
author George Burgess IV <gbiv@google.com> Thu Jan 26 21:03:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 21:03:52 2017 +0000
tree 16a01adccf89d0bb2a34e39e3e86520b5fc32788
parent c5fb338d751b4e6ef88f825764fd0ccae1ccb1a1
parent e660fa7de4fe21e78b427e01356e732a39800e77

Merge "Revert "Fix "Dereference of null pointer" compiler warning."" am: edbb04f4a0
am: e660fa7de4

Change-Id: I0cbb8174d73ef374a6f73988250f477502dc5c80

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 f0f7cbc..4d763d0 100644
--- a/media/libstagefright/codecs/aacenc/src/dyn_bits.c
+++ b/media/libstagefright/codecs/aacenc/src/dyn_bits.c
@@ -20,15 +20,11 @@
 
 *******************************************************************************/
 
-#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
@@ -300,9 +296,6 @@
     case SHORT_WINDOW:
       sideInfoTab = sideInfoTabShort;
       break;
-    default:
-      ALOGE("invalid blockType: %d", blockType);
-      return;
   }