commit b9f757c7bf5199bf8247932a8ca5f98ee32bf3a0
author Sarah Parker <sarahparker@google.com> Fri Jan 06 17:12:24 2017 -0800
committer Sarah Parker <sarahparker@google.com> Mon Jan 09 18:50:51 2017 -0800
tree f64bd5a46c791c1b2fd57803b77ac1769abd2ef5
parent ab44fd14c1e3f1b84478186268569a757a0c9de9

Refactor compound_segment to try different segmentation masks

Change-Id: I7c992c9aae895aebcfb5c147cb179cf665c0ac10

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index e07625d..ce2e30e 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1888,7 +1888,8 @@
     }
 #if CONFIG_COMPOUND_SEGMENT
     else if (mbmi->interinter_compound_data.type == COMPOUND_SEG) {
-      mbmi->interinter_compound_data.which = aom_read_bit(r, ACCT_STR);
+      mbmi->interinter_compound_data.mask_type =
+          aom_read_literal(r, MAX_SEG_MASK_BITS, ACCT_STR);
     }
 #endif  // CONFIG_COMPOUND_SEGMENT
   }