commit ee2dbf76c5982bc1985dfa91ce3fb683d2d0ef1e
author Debargha Mukherjee <debargha@google.com> Mon May 01 11:55:17 2017 -0700
committer James Zern <jzern@google.com> Mon May 01 22:20:33 2017 +0000
tree 343a294a2f8b5935efb068bd4a57d2abb9af1227
parent c860964ac65d36531a9fa573e2c2de128ebcdded

Fix for failures due to null trees

Previous fix was inadvertently removed due to a rebase issue.

BUG=aomedia:463

Change-Id: I607737ee64c35e679b19d3df97bb1b4ee47de268

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 5c69d9f..211025a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8749,10 +8749,10 @@
     best_mv[0].as_int = cur_mv[0].as_int;
     best_mv[1].as_int = cur_mv[1].as_int;
     memset(&best_compound_data, 0, sizeof(INTERINTER_COMPOUND_DATA));
-    av1_cost_tokens(compound_type_cost, cm->fc->compound_type_prob[bsize],
-                    av1_compound_type_tree);
 
     if (masked_compound_used) {
+      av1_cost_tokens(compound_type_cost, cm->fc->compound_type_prob[bsize],
+                      av1_compound_type_tree);
       // get inter predictors to use for masked compound modes
       av1_build_inter_predictors_for_planes_single_buf(
           xd, bsize, 0, 0, mi_row, mi_col, 0, preds0, strides);