Skip to content
Snippets Groups Projects
Commit a5af9308 authored by Xiaoyu Xiu's avatar Xiaoyu Xiu
Browse files

Merge branch 'master' into JVET_P0517_Adaptive_Color_Transform 

# Conflicts:
#	source/Lib/CommonLib/TypeDef.h
#	source/Lib/EncoderLib/IntraSearch.cpp
parents 7bcae90b ebe27be5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1178 additions and 41 deletions
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