Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
bc54f9dc
Commit
bc54f9dc
authored
Nov 06, 2015
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Nov 06, 2015
Browse files
Merge "Resolve conficts caused by master branch merging" into nextgenv2
parents
c7c69d88
707cd036
Changes
1
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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment