ref: fed62e047bd7b01cfb784a6910f551b7930222fd
parent: 04956a6113e00c86893b89dc74e9b293853de6c6
parent: f551c2d1c07fef2fc6d1b4b08737c66ac2a89f07
author: Ronald S. Bultje <rbultje@google.com>
date: Mon Apr 15 06:27:22 EDT 2013
Merge "Fix width/height switch-up in U/V SB quantize code." into experimental
--- a/vp9/encoder/vp9_quantize.c
+++ b/vp9/encoder/vp9_quantize.c
@@ -477,7 +477,7 @@
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_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_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;