From: hui su <huisu@google.com>
Date: Fri, 6 Nov 2015 22:35:08 +0000 (-0800)
Subject: Resolve conficts caused by master branch merging
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=707cd03658a8240187cfc74a7b0c7446de73e77a;p=libvpx

Resolve conficts caused by master branch merging

Change-Id: I167e241b789331572581fcb0567ebe535b4b9345
---

diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c
index caef8eb7a..28aa9152a 100644
--- a/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@ -934,9 +934,6 @@ static void build_intra_predictors_high(const MACROBLOCKD *xd,
   int x0, y0;
   const struct macroblockd_plane *const pd = &xd->plane[plane];
 #endif
-  const int need_left = extend_modes[mode] & NEED_LEFT;
-  const int need_above = extend_modes[mode] & NEED_ABOVE;
-  const int need_aboveright = extend_modes[mode] & NEED_ABOVERIGHT;
   int base = 128 << (bd - 8);
   // 127 127 127 .. 127 127 127 127 127 127
   // 129  A   B  ..  Y   Z