Skip to content
Snippets Groups Projects
Commit b43e3943 authored by Yan Zhang's avatar Yan Zhang
Browse files

Merge branch 'master' into 'JVET-O0455-SW'

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h
parents 58a620df b10ff9b1
No related branches found
No related tags found
1 merge request!776JVET-O0455: Separate maximum number of IBC merge candidates from regular merge mode
Showing
with 681 additions and 8 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment