Simply the code path when jnt-comp is off

Change-Id: I17a82393f1b7230119f499e2f9ed8d0b8fe5ba25

Simply the code path when jnt-comp is off
Change-Id: I17a82393f1b7230119f499e2f9ed8d0b8fe5ba25
6fa05dcf · Zoe Liu · 4d6ea54e · 6fa05dcf
Commit 6fa05dcf authored Dec 05, 2017 by Zoe Liu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

av1/decoder/decodemv.c av1/decoder/decodemv.c +1 -6

No files found.
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2272,12 +2272,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
 #endif  // CONFIG_EXT_SKIP
      ) {
    if (is_any_masked_compound_used(bsize)) {
-#if CONFIG_JNT_COMP
-      if (cm->allow_masked_compound && mbmi->compound_idx)
-#else
-      if (cm->allow_masked_compound)
-#endif  // CONFIG_JNT_COMP
-      {
+      if (cm->allow_masked_compound) {
        if (!is_interinter_compound_used(COMPOUND_WEDGE, bsize))
          mbmi->interinter_compound_type =
              aom_read_bit(r, ACCT_STR) ? COMPOUND_AVERAGE : COMPOUND_SEG;