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

102e5d9d

Commit 102e5d9d authored 5 years ago by Frank Bossen

Downloads
- Plain Diff

Merge branch 'master' into 'P0042-InterDirCtx'

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

parents b6355a0e 94c3c951

No related branches found

No related tags found

No related merge requests found

Changes 7

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/Rom.cpp 6 additions, 1 deletion

source/Lib/CommonLib/Rom.cpp
source/Lib/CommonLib/TypeDef.h 10 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 4 additions, 0 deletions

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

source/Lib/EncoderLib/CABACWriter.cpp

with 42 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