Don't use tx32x32 for macroblocks.

Change-Id: Ib674e0153ca360867ab7a20ba291ac9171a01250

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index a79cb5aaded192fd00db163139b3932385ceee76..5eea50779aacd821ccf5abde173f729eb8215458 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -4577,7 +4577,7 @@ static void rd_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
       (cpi->oxcf.arnr_max_frames == 0) &&
       (best_mbmode.mode != ZEROMV || best_mbmode.ref_frame != ALTREF_FRAME)) {
     mbmi->mode = ZEROMV;
-    if (cm->txfm_mode != TX_MODE_SELECT)
+    if (cm->txfm_mode <= ALLOW_8X8)
       mbmi->txfm_size = cm->txfm_mode;
     else
       mbmi->txfm_size = TX_16X16;