Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

ECM
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9ab618d1

Commit 9ab618d1 authored 4 years ago by Biao Wang

Downloads
- Plain Diff

Merge branch 'R0156_proposal4' into 'master'

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

parents c03e3e2f 2275adb3

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

cfg/lossless/lossless.cfg 2 additions, 0 deletions

cfg/lossless/lossless.cfg
doc/software-manual.tex 6 additions, 0 deletions

doc/software-manual.tex
source/App/EncoderApp/EncApp.cpp 3 additions, 0 deletions

source/App/EncoderApp/EncApp.cpp
source/App/EncoderApp/EncAppCfg.cpp 3 additions, 0 deletions

source/App/EncoderApp/EncAppCfg.cpp
source/App/EncoderApp/EncAppCfg.h 3 additions, 0 deletions

source/App/EncoderApp/EncAppCfg.h
source/Lib/CommonLib/TypeDef.h 2 additions, 2 deletions

source/Lib/CommonLib/TypeDef.h
source/Lib/DecoderLib/DecLib.cpp 1 addition, 1 deletion

source/Lib/DecoderLib/DecLib.cpp
source/Lib/EncoderLib/EncCfg.h 7 additions, 3 deletions

source/Lib/EncoderLib/EncCfg.h
source/Lib/EncoderLib/EncSlice.cpp 4 additions, 0 deletions

source/Lib/EncoderLib/EncSlice.cpp

with 31 additions and 6 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