Skip to content
Snippets Groups Projects
Commit b1173585 authored by Rickard Sjöberg's avatar Rickard Sjöberg
Browse files

Merge branch 'master' into 'JVET-O0235_NAL_UNIT_TYPE_CONSTRAINTS' to solve...

Merge branch 'master' into 'JVET-O0235_NAL_UNIT_TYPE_CONSTRAINTS' to solve merge conflicts related to #defines.

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h
parents 0b4e861d 9ac94845
No related branches found
No related tags found
No related merge requests found
Showing
with 28 additions and 1238 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