From: Geza Lore <gezalore@gmail.com>
Date: Tue, 26 Jan 2016 15:27:43 +0000 (+0000)
Subject: Reintroduce VAR_TX fix
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5aa655f79a47f0e05e2da6ee3ae940fb7ec8af72;p=libvpx

Reintroduce VAR_TX fix

Reintroduce part of
Iaf2b717e6b8626b2b6a03226127221b776b49884
Which was later reverted in
I4c5b40ec63a6f19521191d3c730af87db3c4bc00

Change-Id: If3e5610ba3985ae7b4d952d8e616982465ac667a
---

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 58efdcafd..911194921 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -5424,13 +5424,8 @@ static int64_t handle_inter_mode(VP10_COMP *cpi, MACROBLOCK *x,
     vp10_subtract_plane(x, bsize, 0);
 #if CONFIG_VAR_TX
     if (cm->tx_mode == TX_MODE_SELECT || xd->lossless[mbmi->segment_id]) {
-#if CONFIG_EXT_TX
       select_tx_type_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse,
                          bsize, ref_best_rd);
-#else
-      inter_block_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse,
-                      bsize, ref_best_rd);
-#endif  // CONFIG_EXT_TX
     } else {
       int idx, idy;
       super_block_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse,