From: Ronald S. Bultje <rbultje@google.com>
Date: Sat, 13 Apr 2013 19:40:34 +0000 (-0700)
Subject: Fix width/height switch-up in U/V SB quantize code.
X-Git-Tag: v1.3.0~1106^2~256^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f551c2d1c07fef2fc6d1b4b08737c66ac2a89f07;p=libvpx

Fix width/height switch-up in U/V SB quantize code.

Change-Id: I697514efd6024e1b4153bbde58ae5e323b030981
---

diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c
index 83fa1dafd..1401bd64e 100644
--- a/vp9/encoder/vp9_quantize.c
+++ b/vp9/encoder/vp9_quantize.c
@@ -477,7 +477,7 @@ void vp9_quantize_sbuv_32x32(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
 
 void vp9_quantize_sbuv_16x16(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
   const int bwl = mb_width_log2(bsize);
-  const int bhl = mb_width_log2(bsize);
+  const int bhl = mb_height_log2(bsize);
   const int uoff = 16 << (bhl + bwl);
   int i;
 
@@ -487,7 +487,7 @@ void vp9_quantize_sbuv_16x16(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
 
 void vp9_quantize_sbuv_8x8(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
   const int bwl = mb_width_log2(bsize);
-  const int bhl = mb_width_log2(bsize);
+  const int bhl = mb_height_log2(bsize);
   const int uoff = 16 << (bhl + bwl);
   int i;
 
@@ -497,7 +497,7 @@ void vp9_quantize_sbuv_8x8(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
 
 void vp9_quantize_sbuv_4x4(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
   const int bwl = mb_width_log2(bsize);
-  const int bhl = mb_width_log2(bsize);
+  const int bhl = mb_height_log2(bsize);
   const int uoff = 16 << (bhl + bwl);
   int i;