From: Jingning Han <jingning@google.com>
Date: Sat, 27 Feb 2016 01:22:03 +0000 (+0000)
Subject: Merge "Unify frame border extension operation" into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dca86af8f46f6d801a09e0dc0c7f568da6bd9751;p=libvpx

Merge "Unify frame border extension operation" into nextgenv2
---

dca86af8f46f6d801a09e0dc0c7f568da6bd9751
diff --cc vp10/decoder/decodeframe.c
index b281c7483,1cb72160c..a1b153414
--- a/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,