Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
ee4a34c2
Commit
ee4a34c2
authored
Jun 07, 2017
by
Angie Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflict between lv_map and cb4x4
Change-Id: I0512000554ef74d397332e5ed135fe20e2c4a37e
parent
d61e608d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
av1/encoder/encodetxb.c
av1/encoder/encodetxb.c
+5
-0
No files found.
av1/encoder/encodetxb.c
View file @
ee4a34c2
...
...
@@ -184,7 +184,12 @@ void av1_write_coeffs_mb(const AV1_COMMON *const cm, MACROBLOCK *x,
struct
macroblockd_plane
*
pd
=
&
xd
->
plane
[
plane
];
#if CONFIG_CB4X4
#if CONFIG_CHROMA_2X2
const
BLOCK_SIZE
plane_bsize
=
get_plane_block_size
(
bsize
,
pd
);
#else
const
BLOCK_SIZE
plane_bsize
=
AOMMAX
(
BLOCK_4X4
,
get_plane_block_size
(
bsize
,
pd
));
#endif // CONFIG_CHROMA_2X2
#else
const
BLOCK_SIZE
plane_bsize
=
get_plane_block_size
(
AOMMAX
(
bsize
,
BLOCK_8X8
),
pd
);
...
...
Write
Preview
Markdown
is supported
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