commit efcf1e9128fe40a432dc8539493669d17e11cc01
author Yaowu Xu <yaowu@google.com> Fri Jan 12 17:05:46 2018 -0800
committer Yaowu Xu <yaowu@google.com> Sat Jan 13 07:28:21 2018 +0000
tree 8106d034edc4c2db44cc23c8f0f82e386ad14c64
parent 40125caa9b798a0bcfebeb917b4baa54d26c7e4e

Make definitions and declarations consistent

This fixes several MSVC warnings.

Change-Id: Id94f509a56d195afb48c3f2fa71986e0d8baafb4

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 2615029..ce8d1d7 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -421,7 +421,7 @@
 }
 #endif  // !CONFIG_LV_MAP
 
-int av1_optimize_b(const AV1_COMP *const cpi, MACROBLOCK *mb, int plane,
+int av1_optimize_b(const struct AV1_COMP *cpi, MACROBLOCK *mb, int plane,
                    int blk_row, int blk_col, int block, BLOCK_SIZE plane_bsize,
                    TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
                    const ENTROPY_CONTEXT *l, int fast_mode) {
@@ -741,7 +741,7 @@
                                          encode_block_pass1, &args);
 }
 
-void av1_encode_sb(const AV1_COMP *const cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
+void av1_encode_sb(const struct AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
                    int mi_row, int mi_col, RUN_TYPE dry_run) {
   (void)dry_run;
   MACROBLOCKD *const xd = &x->e_mbd;
@@ -918,7 +918,7 @@
 #endif  // CONFIG_CFL
 }
 
-void av1_encode_intra_block_plane(const AV1_COMP *const cpi, MACROBLOCK *x,
+void av1_encode_intra_block_plane(const struct AV1_COMP *cpi, MACROBLOCK *x,
                                   BLOCK_SIZE bsize, int plane,
                                   int enable_optimize_b, int mi_row,
                                   int mi_col) {

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index b360342..928a12e 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -1977,7 +1977,7 @@
                                txb_costs, txb_eob_costs, p, block, fast_mode);
 }
 
-int av1_optimize_txb(const AV1_COMP *const cpi, MACROBLOCK *x, int plane,
+int av1_optimize_txb(const struct AV1_COMP *cpi, MACROBLOCK *x, int plane,
                      int blk_row, int blk_col, int block, TX_SIZE tx_size,
                      TXB_CTX *txb_ctx, int fast_mode) {
   const AV1_COMMON *cm = &cpi->common;