Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

VVCSoftware_VTM
- Activity
- Members
- Labels
- Wiki
- Environments
- Terraform modules

Snippets Groups Projects

4707dabb

Commit 4707dabb authored 4 years ago by Frank Bossen

Downloads
- Plain Diff

Merge branch 'master' into 'R0091_Constraint_slice_order'

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

parents 2940d7d7 3f9318e9

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

cfg/partitioning/rpr_no_subpic_single_slice_per_subpic.cfg 20 additions, 0 deletions

cfg/partitioning/rpr_no_subpic_single_slice_per_subpic.cfg
source/App/EncoderApp/EncApp.cpp 1 addition, 1 deletion

source/App/EncoderApp/EncApp.cpp
source/App/EncoderApp/EncAppCfg.cpp 6 additions, 5 deletions

source/App/EncoderApp/EncAppCfg.cpp
source/Lib/CommonLib/Slice.cpp 55 additions, 39 deletions

source/Lib/CommonLib/Slice.cpp
source/Lib/CommonLib/TypeDef.h 8 additions, 0 deletions

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

source/Lib/DecoderLib/DecLib.cpp
source/Lib/DecoderLib/VLCReader.cpp 41 additions, 2 deletions

source/Lib/DecoderLib/VLCReader.cpp
source/Lib/EncoderLib/VLCWriter.cpp 12 additions, 2 deletions

source/Lib/EncoderLib/VLCWriter.cpp

with 151 additions and 49 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