commit 6062a8bfee3ee0e2f104b51cb8a36b7bab7c56b4
author Angie Chiang <angiebird@google.com> Wed Sep 21 16:01:04 2016 -0700
committer Angie Chiang <angiebird@google.com> Thu Sep 22 09:37:56 2016 -0700
tree 2c1b8edf86ab2d04ff6573206bd7547672a37933
parent 7a9ad9c83f7a1f562bc464e88b640901631c4aa1

bitstream_debug: build related cleanup

Move experimental config from debug_util.c/h to aom_util.mk to avoid
empty object.

Change-Id: Id7978ed6a342262bddaa4df8b53115e750fa1c2c

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index ce16fcf..4f50302 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -19,7 +19,9 @@
 #include "aom_mem/aom_mem.h"
 #include "aom_ports/mem_ops.h"
 #include "aom_ports/system_state.h"
+#if CONFIG_BITSTREAM_DEBUG
 #include "aom_util/debug_util.h"
+#endif  // CONFIG_BITSTREAM_DEBUG
 
 #if CONFIG_CLPF
 #include "av1/common/clpf.h"

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index a5dcfc6..56ba676 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -65,7 +65,9 @@
 #include "aom_ports/mem.h"
 #include "aom_ports/system_state.h"
 #include "aom_scale/aom_scale.h"
+#if CONFIG_BITSTREAM_DEBUG
 #include "aom_util/debug_util.h"
+#endif  // CONFIG_BITSTREAM_DEBUG
 
 #define AM_SEGMENT_ID_INACTIVE 7
 #define AM_SEGMENT_ID_ACTIVE 0