summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2013-11-07 11:39:04 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-11-07 11:39:04 -0800
commitabdefeaa89a0908327518e5ca75c935c66b2e1aa (patch)
treec5af3633c713314661549e2810bbe9eecc53b4a1 /vp9
parent6cf3b98ac2df088d58e5ff834d025139ee3a9f54 (diff)
parente91d7705111cbb2a9a8c0e85a9bbc3bc60ef9d43 (diff)
downloadlibvpx-abdefeaa89a0908327518e5ca75c935c66b2e1aa.tar
libvpx-abdefeaa89a0908327518e5ca75c935c66b2e1aa.tar.gz
libvpx-abdefeaa89a0908327518e5ca75c935c66b2e1aa.tar.bz2
libvpx-abdefeaa89a0908327518e5ca75c935c66b2e1aa.zip
Merge "Fix the variable naming in encode_block"
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_encodemb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index e52e8ec1e..75ed8eab7 100644
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -430,11 +430,11 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
// 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;
}