Resolve conficts caused by master branch merging

Change-Id: I167e241b789331572581fcb0567ebe535b4b9345

vp10/common/reconintra.c

diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c
index caef8eb..28aa915 100644
--- a/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@ -934,9 +934,6 @@
   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