Skip to content
Snippets Groups Projects
Commit 96aafdc9 authored by Yin Zhao's avatar Yin Zhao
Browse files

Merge remote-tracking branch 'remotes/origin/master' into JVET-O0050 

# Conflicts:
#	source/Lib/DecoderLib/CABACReader.cpp
#	source/Lib/EncoderLib/CABACWriter.cpp
#	source/Lib/EncoderLib/EncCu.cpp
parents f48eed9e eae3419a
No related branches found
No related tags found
1 merge request!757JVET-O0050: avoid small intra prediction with a local dual-tree technique
Hide whitespace changes
Inline Side-by-side
Showing
with 518 additions and 18 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