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

4e4317da

Commit 4e4317da authored 5 years ago by Frank Bossen

Downloads
- Plain Diff

Merge branch 'master' into 'JVET-O0061fix'

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

parents 99157bd9 9feae237

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/Lib/CommonLib/LoopFilter.cpp 15 additions, 2 deletions

source/Lib/CommonLib/LoopFilter.cpp
source/Lib/CommonLib/LoopFilter.h 4 additions, 0 deletions

source/Lib/CommonLib/LoopFilter.h
source/Lib/CommonLib/TypeDef.h 2 additions, 0 deletions

source/Lib/CommonLib/TypeDef.h
source/Lib/DecoderLib/DecLib.cpp 4 additions, 0 deletions

source/Lib/DecoderLib/DecLib.cpp
source/Lib/EncoderLib/EncAdaptiveLoopFilter.h 1 addition, 0 deletions

source/Lib/EncoderLib/EncAdaptiveLoopFilter.h
source/Lib/EncoderLib/EncGOP.cpp 3 additions, 1 deletion

source/Lib/EncoderLib/EncGOP.cpp

with 29 additions and 3 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