Skip to content
Snippets Groups Projects
Commit 17dab219 authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Merge branch 'master' into 'fix_vtm_1648'

# Conflicts:
#   source/Lib/CommonLib/InterPrediction.cpp
parents b619a3c2 798c36c5
No related branches found
No related tags found
No related merge requests found
Showing
with 482 additions and 122 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