Merge "Unify frame border extension operation" into nextgenv2

diff --cc vp10/common/reconinter.c
Simple merge

diff --cc vp10/decoder/decodeframe.c
index b281c7483491d2bed5351117b5964600e5700afd,1cb72160cc5e7f0a8f5503d3e90d97bf0fea234d..a1b1534149b25b7da4012c9d422a90271904db70
--- 1/vp10/decoder/decodeframe.c
--- 2/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@@ -871,18 -867,8 +867,19 @@@ static void dec_build_inter_predictors_
        }
      }
    }
 +#if CONFIG_EXT_INTER
 +  if (is_interintra_pred(&xd->mi[0]->mbmi))
 +    vp10_build_interintra_predictors(xd,
 +                                     xd->plane[0].dst.buf,
 +                                     xd->plane[1].dst.buf,
 +                                     xd->plane[2].dst.buf,
 +                                     xd->plane[0].dst.stride,
 +                                     xd->plane[1].dst.stride,
 +                                     xd->plane[2].dst.stride,
 +                                     sb_type);
 +#endif  // CONFIG_EXT_INTER
  }
+ #endif  // (CONFIG_SUPERTX || CONFIG_OBMC)
  
  #if CONFIG_SUPERTX
  static void dec_build_inter_predictors_sb_sub8x8(VP10Decoder *const pbi,