commit 032ab8b39e4a008bb28364ae68b25f9da41bc0bd
author Hui Su <huisu@google.com> Tue Sep 19 14:53:40 2017 -0700
committer Hui Su <huisu@google.com> Sat Sep 23 05:18:51 2017 +0000
tree be6fc73b079d512d380af404b1366db670b04dca
parent de5bdcad437f1515c1ec7c8e8330d00149234165

Move local functions out of blockd.h

Change-Id: Id667950de84ad6a0b55222264a0ce8473cd10bcc

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 98d34ec..42198bb 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1257,6 +1257,17 @@
                           pd->dst.stride);
 }
 
+#if CONFIG_EXT_TX
+// 1D Transforms used in inter set, this needs to be changed if
+// ext_tx_used_inter is changed
+static const int ext_tx_used_inter_1D[EXT_TX_SETS_INTER][TX_TYPES_1D] = {
+  { 1, 0, 0, 0 }, { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 1, 0, 0, 1 },
+#if CONFIG_MRC_TX
+  { 1, 0, 0, 1 },
+#endif  // CONFIG_MRC_TX
+};
+#endif  // CONFIG_EXT_TX
+
 static int prune_tx_types(const AV1_COMP *cpi, BLOCK_SIZE bsize, MACROBLOCK *x,
                           const MACROBLOCKD *const xd, int tx_set) {
 #if CONFIG_EXT_TX