Commit 707cd036 authored by hui su's avatar hui su
Browse files

Resolve conficts caused by master branch merging

Change-Id: I167e241b789331572581fcb0567ebe535b4b9345
parent 85514c40
...@@ -934,9 +934,6 @@ static void build_intra_predictors_high(const MACROBLOCKD *xd, ...@@ -934,9 +934,6 @@ static void build_intra_predictors_high(const MACROBLOCKD *xd,
int x0, y0; int x0, y0;
const struct macroblockd_plane *const pd = &xd->plane[plane]; const struct macroblockd_plane *const pd = &xd->plane[plane];
#endif #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); int base = 128 << (bd - 8);
// 127 127 127 .. 127 127 127 127 127 127 // 127 127 127 .. 127 127 127 127 127 127
// 129 A B .. Y Z // 129 A B .. Y Z
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment