Skip to content
Snippets Groups Projects
Commit 0a9b42b3 authored by Shaowei Xie's avatar Shaowei Xie
Browse files

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

# Conflicts:
#   cfg/encoder_lowdelay_P_vtm.cfg
#   cfg/encoder_lowdelay_vtm.cfg
#   source/Lib/CommonLib/TypeDef.h
parents 0fe73980 881095e0
No related branches found
No related tags found
1 merge request!2700JVET-AF0122-SW: Lagrange multiplier optimization for ALF
Hide whitespace changes
Inline Side-by-side
Showing
with 185 additions and 165 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