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

a28245ea

Commit a28245ea authored 5 years ago by Frank Bossen

Downloads
- Plain Diff

Merge branch 'master' into 'JVET-O0265'

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

parents 288fb039 e1149b0d

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

source/App/EncoderApp/EncAppCfg.cpp 2 additions, 2 deletions

source/App/EncoderApp/EncAppCfg.cpp
source/Lib/CommonLib/TrQuant.cpp 1 addition, 1 deletion

source/Lib/CommonLib/TrQuant.cpp
source/Lib/CommonLib/TypeDef.h 3 additions, 2 deletions

source/Lib/CommonLib/TypeDef.h
source/Lib/CommonLib/UnitTools.cpp 8 additions, 25 deletions

source/Lib/CommonLib/UnitTools.cpp
source/Lib/CommonLib/UnitTools.h 2 additions, 2 deletions

source/Lib/CommonLib/UnitTools.h
source/Lib/DecoderLib/CABACReader.cpp 4 additions, 22 deletions

source/Lib/DecoderLib/CABACReader.cpp
source/Lib/DecoderLib/VLCReader.cpp 22 additions, 7 deletions

source/Lib/DecoderLib/VLCReader.cpp
source/Lib/EncoderLib/CABACWriter.cpp 4 additions, 11 deletions

source/Lib/EncoderLib/CABACWriter.cpp
source/Lib/EncoderLib/IntraSearch.cpp 18 additions, 46 deletions

source/Lib/EncoderLib/IntraSearch.cpp
source/Lib/EncoderLib/VLCWriter.cpp 18 additions, 5 deletions

source/Lib/EncoderLib/VLCWriter.cpp

with 82 additions and 123 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 sign in to comment