From: Angie Chiang <angiebird@google.com>
Date: Thu, 12 Nov 2015 23:38:44 +0000 (+0000)
Subject: Merge changes Ifafbd497,I042bba27,Id6fd8558,Id5b79519 into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35ec6d2b8851d0c06f5b1aaf4fb392f6001171d2;p=libvpx

Merge changes Ifafbd497,I042bba27,Id6fd8558,Id5b79519 into nextgenv2

* changes:
  Add adst_dct config to vp10_inv_txfm2d_cfg
  Add adst_adst config to vp10_inv_txfm2d_cfg
  Add dct_adst config to vp10_inv_txfm2d_cfg
  Add dct_dct config to vp10_inv_txfm2d_cfg
---

35ec6d2b8851d0c06f5b1aaf4fb392f6001171d2