cosmetic: fix '= & ' construct

remove useless space after address-of operator.

Change-Id: I1fb9e82e8d6cf87558fbd454fb5c0f87599ca2ab

2 files changed, 23 insertions, 23 deletions

diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c
index f72fc3f1d..29b689f25 100644
--- a/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@ -77,7 +77,7 @@ static void vp8_kfread_modes(VP8D_COMP *pbi,
                              MODE_INFO *m,
                              int mb_row,
                              int mb_col) {
-  VP8_COMMON *const cm = & pbi->common;
+  VP8_COMMON *const cm = &pbi->common;
   vp8_reader *const bc = pbi->mb.current_bc;
   const int mis = pbi->common.mode_info_stride;
   int map_index = mb_row * pbi->common.mb_cols + mb_col;
@@ -97,7 +97,7 @@ static void vp8_kfread_modes(VP8D_COMP *pbi,
                           m->mbmi.segment_id, SEG_LVL_EOB) ||
        (get_segdata(&pbi->mb,
                     m->mbmi.segment_id, SEG_LVL_EOB) != 0))) {
-    MACROBLOCKD *const xd  = & pbi->mb;
+    MACROBLOCKD *const xd  = &pbi->mb;
     m->mbmi.mb_skip_coeff = vp8_read(bc, get_pred_prob(cm, xd, PRED_MBSKIP));
   } else {
     if (segfeature_active(&pbi->mb,
@@ -458,7 +458,7 @@ static MV_REFERENCE_FRAME read_ref_frame(VP8D_COMP *pbi,
   int seg_ref_active;
   int seg_ref_count = 0;
 
-  VP8_COMMON *const cm = & pbi->common;
+  VP8_COMMON *const cm = &pbi->common;
   MACROBLOCKD *const xd = &pbi->mb;
 
   seg_ref_active = segfeature_active(xd,
@@ -598,8 +598,8 @@ static const unsigned char mbsplit_fill_offset[4][16] = {
 
 #if CONFIG_SWITCHABLE_INTERP
 static void read_switchable_interp_probs(VP8D_COMP *pbi) {
-  VP8_COMMON *const cm = & pbi->common;
-  vp8_reader *const bc = & pbi->bc;
+  VP8_COMMON *const cm = &pbi->common;
+  vp8_reader *const bc = &pbi->bc;
   int i, j;
   for (j = 0; j <= VP8_SWITCHABLE_FILTERS; ++j) {
   //for (j = 0; j <= 0; ++j) {
@@ -613,14 +613,14 @@ static void read_switchable_interp_probs(VP8D_COMP *pbi) {
 #endif
 
 static void mb_mode_mv_init(VP8D_COMP *pbi, vp8_reader *bc) {
-  VP8_COMMON *const cm = & pbi->common;
+  VP8_COMMON *const cm = &pbi->common;
 #if CONFIG_NEWMVENTROPY
   nmv_context *const nmvc = &pbi->common.fc.nmvc;
 #else
   MV_CONTEXT *const mvc = pbi->common.fc.mvc;
   MV_CONTEXT_HP *const mvc_hp = pbi->common.fc.mvc_hp;
 #endif
-  MACROBLOCKD *const xd  = & pbi->mb;
+  MACROBLOCKD *const xd  = &pbi->mb;
 
   if (cm->frame_type == KEY_FRAME) {
     if (!cm->kf_ymode_probs_update)
@@ -677,8 +677,8 @@ static void mb_mode_mv_init(VP8D_COMP *pbi, vp8_reader *bc) {
 // value
 static void read_mb_segment_id(VP8D_COMP *pbi,
                                int mb_row, int mb_col) {
-  VP8_COMMON *const cm = & pbi->common;
-  MACROBLOCKD *const xd  = & pbi->mb;
+  VP8_COMMON *const cm = &pbi->common;
+  MACROBLOCKD *const xd  = &pbi->mb;
   vp8_reader *const bc = xd->current_bc;
   MODE_INFO *mi = xd->mode_info_context;
   MB_MODE_INFO *mbmi = &mi->mbmi;
@@ -749,7 +749,7 @@ static void read_mb_segment_id(VP8D_COMP *pbi,
 static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
                              MODE_INFO *prev_mi,
                              int mb_row, int mb_col) {
-  VP8_COMMON *const cm = & pbi->common;
+  VP8_COMMON *const cm = &pbi->common;
 #if CONFIG_NEWMVENTROPY
   nmv_context *const nmvc = &pbi->common.fc.nmvc;
 #else
@@ -757,10 +757,10 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
   MV_CONTEXT_HP *const mvc_hp = pbi->common.fc.mvc_hp;
 #endif
   const int mis = pbi->common.mode_info_stride;
-  MACROBLOCKD *const xd  = & pbi->mb;
+  MACROBLOCKD *const xd  = &pbi->mb;
   vp8_reader *const bc = xd->current_bc;
 
-  int_mv *const mv = & mbmi->mv;
+  int_mv *const mv = &mbmi->mv;
   int mb_to_left_edge;
   int mb_to_right_edge;
   int mb_to_top_edge;
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 4d12d7a3e..f966a06e9 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -77,7 +77,7 @@ static vp8_prob read_prob_diff_update(vp8_reader *const bc, int oldp) {
 void vp8cx_init_de_quantizer(VP8D_COMP *pbi) {
   int i;
   int Q;
-  VP8_COMMON *const pc = & pbi->common;
+  VP8_COMMON *const pc = &pbi->common;
 
   for (Q = 0; Q < QINDEX_RANGE; Q++) {
     pc->Y1dequant[Q][0] = (short)vp8_dc_quant(Q, pc->y1dc_delta_q);
@@ -98,7 +98,7 @@ void vp8cx_init_de_quantizer(VP8D_COMP *pbi) {
 void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) {
   int i;
   int QIndex;
-  VP8_COMMON *const pc = & pbi->common;
+  VP8_COMMON *const pc = &pbi->common;
   int segment_id = xd->mode_info_context->mbmi.segment_id;
 
   // Set the Q baseline allowing for any segment level adjustment
@@ -815,8 +815,8 @@ static void setup_token_decoder(VP8D_COMP *pbi,
 }
 
 static void init_frame(VP8D_COMP *pbi) {
-  VP8_COMMON *const pc = & pbi->common;
-  MACROBLOCKD *const xd  = & pbi->mb;
+  VP8_COMMON *const pc = &pbi->common;
+  MACROBLOCKD *const xd  = &pbi->mb;
 
   if (pc->frame_type == KEY_FRAME) {
     /* Various keyframe initializations */
@@ -893,8 +893,8 @@ static void init_frame(VP8D_COMP *pbi) {
 static void read_coef_probs2(VP8D_COMP *pbi) {
   const vp8_prob grpupd = 192;
   int i, j, k, l;
-  vp8_reader *const bc = & pbi->bc;
-  VP8_COMMON *const pc = & pbi->common;
+  vp8_reader *const bc = &pbi->bc;
+  VP8_COMMON *const pc = &pbi->common;
   for (l = 0; l < ENTROPY_NODES; l++) {
     if (vp8_read(bc, grpupd)) {
       // printf("Decoding %d\n", l);
@@ -936,8 +936,8 @@ static void read_coef_probs2(VP8D_COMP *pbi) {
 
 static void read_coef_probs(VP8D_COMP *pbi) {
   int i, j, k, l;
-  vp8_reader *const bc = & pbi->bc;
-  VP8_COMMON *const pc = & pbi->common;
+  vp8_reader *const bc = &pbi->bc;
+  VP8_COMMON *const pc = &pbi->common;
 
   {
     if (vp8_read_bit(bc)) {
@@ -1061,9 +1061,9 @@ static void read_coef_probs(VP8D_COMP *pbi) {
 }
 
 int vp8_decode_frame(VP8D_COMP *pbi) {
-  vp8_reader *const bc = & pbi->bc;
-  VP8_COMMON *const pc = & pbi->common;
-  MACROBLOCKD *const xd  = & pbi->mb;
+  vp8_reader *const bc = &pbi->bc;
+  VP8_COMMON *const pc = &pbi->common;
+  MACROBLOCKD *const xd  = &pbi->mb;
   const unsigned char *data = (const unsigned char *)pbi->Source;
   const unsigned char *data_end = data + pbi->source_sz;
   ptrdiff_t first_partition_length_in_bytes = 0;