Skip to content
GitLab
Commit bc54f9dc authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Gerrit Code Review
Browse files

Merge "Resolve conficts caused by master branch merging" into nextgenv2

parents c7c69d88 707cd036
Hide whitespace changes
Inline Side-by-side
vp10/common/reconintra.c
View file @ bc54f9dc
......@@ -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
......
Supports Markdown
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