commit 619576b4127f3bf888afa400b11ebd47bdc709d0
author Alex Converse <aconverse@google.com> Wed May 10 15:14:18 2017 -0700
committer Alex Converse <aconverse@google.com> Thu May 11 19:31:32 2017 +0000
tree d314f9e41e43986a00968f90aca5c504af58c817
parent 5ab58722c60709ab51af415f8cbde8a56fbbf807

Deduplicate write_mb_modes_kf declaration

Change-Id: I325f781759c1087815a38ff7c12ea31b8e444575

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index a41ed49..436ce37 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2083,15 +2083,14 @@
 #endif  // !CONFIG_TXK_SEL
 }
 
+static void write_mb_modes_kf(AV1_COMMON *cm,
 #if CONFIG_DELTA_Q
-static void write_mb_modes_kf(AV1_COMMON *cm, MACROBLOCKD *xd, const int mi_row,
-                              const int mi_col, aom_writer *w) {
-  int skip;
+                              MACROBLOCKD *xd,
 #else
-static void write_mb_modes_kf(AV1_COMMON *cm, const MACROBLOCKD *xd,
+                              const MACROBLOCKD *xd,
+#endif  // CONFIG_DELTA_Q
                               const int mi_row, const int mi_col,
                               aom_writer *w) {
-#endif
   const struct segmentation *const seg = &cm->seg;
   struct segmentation_probs *const segp = &cm->fc->seg;
   const MODE_INFO *const mi = xd->mi[0];
@@ -2116,7 +2115,7 @@
   if (seg->update_map) write_segment_id(w, seg, segp, mbmi->segment_id);
 
 #if CONFIG_DELTA_Q
-  skip = write_skip(cm, xd, mbmi->segment_id, mi, w);
+  const int skip = write_skip(cm, xd, mbmi->segment_id, mi, w);
   if (cm->delta_q_present_flag) {
     int super_block_upper_left =
         ((mi_row & MAX_MIB_MASK) == 0) && ((mi_col & MAX_MIB_MASK) == 0);