commit e91d7705111cbb2a9a8c0e85a9bbc3bc60ef9d43
author Jingning Han <jingning@google.com> Wed Nov 06 11:34:06 2013 -0800
committer Jingning Han <jingning@google.com> Thu Nov 07 08:59:14 2013 -0800
tree 3411930109fcc555d62b805da36f72dc38ac24c5
parent 103c4603d2aa366bb8064da29da490b3eb79f307

Fix the variable naming in encode_block

The term x represents macroblock pointer across encode_block. Change
the two local variable names to avoid confusion.

Change-Id: Ic732e73023525d673c0a678ed2708ac1edf5a3f9

vp9/encoder/vp9_encodemb.c

diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index e52e8ec..75ed8ea 100644
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -430,11 +430,11 @@
   // TODO(jingning): per transformed block zero forcing only enabled for
   // luma component. will integrate chroma components as well.
   if (x->zcoeff_blk[tx_size][block] && plane == 0) {
-    int x, y;
+    int i, j;
     pd->eobs[block] = 0;
-    txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &x, &y);
-    ctx->ta[plane][x] = 0;
-    ctx->tl[plane][y] = 0;
+    txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &i, &j);
+    ctx->ta[plane][i] = 0;
+    ctx->tl[plane][j] = 0;
     return;
   }