From: Deb Mukherjee <debargha@google.com>
Date: Thu, 2 Oct 2014 14:37:26 +0000 (-0700)
Subject: rdmult data type change to fix high bit-depth
X-Git-Tag: v1.4.0~689^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35e8fa1458cefdf04591dd3382728c403198c2a0;p=libvpx

rdmult data type change to fix high bit-depth

Fixes an intermittent assert failure for highbitdepth.

Change-Id: If8cad0209a94f1184b69c7b3f1d587934f857d9b
---

diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c
index a32776ac7..efb8686dd 100644
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -136,7 +136,7 @@ static const int rd_frame_type_factor[FRAME_UPDATE_TYPES] = {
 };
 
 int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) {
-  const int q = vp9_dc_quant(qindex, 0, cpi->common.bit_depth);
+  const int64_t q = vp9_dc_quant(qindex, 0, cpi->common.bit_depth);
 #if CONFIG_VP9_HIGHBITDEPTH
   int rdmult = 0;
   switch (cpi->common.bit_depth) {