commit e16b2665c29c4ba9e5da8b264135b6a40f2c1cb5
author Alex Converse <aconverse@google.com> Wed May 24 14:00:00 2017 -0700
committer Alex Converse <aconverse@google.com> Thu May 25 16:55:14 2017 +0000
tree c2e0903c3d167cca3204926b3d4080eac7e3c9c3
parent c156224a40e2b4867becc0aff958b3c7abd35904

var_tx+intrabc: Fix infinite recursion

Change-Id: Ibbf0c14934d0bff316cfdf5c252c64b3e68c73e7

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index af9d5d2..15012a9 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -1188,12 +1188,13 @@
   if (tx_size == plane_tx_size) {
     encode_block(plane, block, blk_row, blk_col, plane_bsize, tx_size, arg);
   } else {
+    assert(tx_size < TX_SIZES_ALL);
     const TX_SIZE sub_txs = sub_tx_size_map[tx_size];
+    assert(sub_txs < tx_size);
     // This is the square transform block partition entry point.
     int bsl = tx_size_wide_unit[sub_txs];
     int i;
     assert(bsl > 0);
-    assert(tx_size < TX_SIZES_ALL);
 
     for (i = 0; i < 4; ++i) {
       const int offsetr = blk_row + ((i >> 1) * bsl);