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

Merge branch 'master' into JVET_P0517_Adaptive_Color_Transform 

# Conflicts:
#	source/Lib/DecoderLib/CABACReader.cpp
#	source/Lib/EncoderLib/CABACWriter.cpp
#	source/Lib/EncoderLib/EncCu.cpp
#	source/Lib/EncoderLib/EncModeCtrl.h
#	source/Lib/EncoderLib/IntraSearch.cpp
parents d5b27b1c d8f67be5
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 131 additions and 34 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