Merge "A fix for a missing tx_type" into nextgenv2

2016-01-22 18:36:46 +00:00
parent 94322a9f9b 4e406f702c
commit 11d3899c60
1 changed files with 1 additions and 0 deletions
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -960,6 +960,7 @@ static void choose_smallest_tx_size(VP10_COMP *cpi, MACROBLOCK *x,
  MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;

  mbmi->tx_size = TX_4X4;
+  mbmi->tx_type = DCT_DCT;

  txfm_rd_in_plane(x,
 #if CONFIG_VAR_TX