Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

VVCSoftware_VTM
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

2e25edb7

Commit 2e25edb7 authored 5 years ago by Frank Bossen

Downloads
- Plain Diff

Merge branch 'master' into 'alf/alf-jvet-p-integrated'

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h

parents 8307bc14 9ac94845

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/Lib/CommonLib/CommonDef.h 4 additions, 0 deletions

source/Lib/CommonLib/CommonDef.h
source/Lib/CommonLib/ContextModelling.h 4 additions, 0 deletions

source/Lib/CommonLib/ContextModelling.h
source/Lib/CommonLib/Contexts.cpp 10 additions, 0 deletions

source/Lib/CommonLib/Contexts.cpp
source/Lib/CommonLib/Rom.cpp 6 additions, 1 deletion

source/Lib/CommonLib/Rom.cpp
source/Lib/CommonLib/TypeDef.h 12 additions, 0 deletions

source/Lib/CommonLib/TypeDef.h
source/Lib/CommonLib/UnitTools.cpp 9 additions, 0 deletions

source/Lib/CommonLib/UnitTools.cpp
source/Lib/DecoderLib/CABACReader.cpp 16 additions, 0 deletions

source/Lib/DecoderLib/CABACReader.cpp
source/Lib/EncoderLib/CABACWriter.cpp 10 additions, 0 deletions

source/Lib/EncoderLib/CABACWriter.cpp

with 71 additions and 1 deletion

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 sign in to comment