From: Jingning Han <jingning@google.com>
Date: Fri, 15 Feb 2013 22:45:20 +0000 (-0800)
Subject: Fixed a subtle issue that breaks encoding process
X-Git-Tag: v1.3.0~1151^2~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e343732a92bddb3e8764e4757487bab6667f744c;p=libvpx

Fixed a subtle issue that breaks encoding process

This issue breaks the encoding process of the codebase. The effect
emerges only in particular test sequence at certain bit-rates and
frame limits.

Change-Id: I02e080f2a49624eef9a21c424053dc2a1d902452
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 4a49728f6..1c4dd5834 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -4306,6 +4306,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
   mode8x8[2]= xd->mode_info_context->bmi[8].as_mode.first;
   mode8x8[3]= xd->mode_info_context->bmi[10].as_mode.first;
 
+  mbmi->txfm_size = TX_4X4;
   error4x4 = rd_pick_intra4x4mby_modes(cpi, x,
                                        &rate4x4, &rate4x4_tokenonly,
                                        &dist4x4, error16x16);