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

92e53b35

Commit 92e53b35 authored 5 years ago by Bae Keun Lee

Downloads
- Plain Diff

Merge branch 'master' into 'JVET_O0173_O0176_O0338_NUMBRICK_M2'

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

parents a9189e99 7c70ec3e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/Lib/CommonLib/Slice.h 1 addition, 1 deletion

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

source/Lib/CommonLib/TypeDef.h
source/Lib/DecoderLib/VLCReader.cpp 9 additions, 0 deletions

source/Lib/DecoderLib/VLCReader.cpp
source/Lib/EncoderLib/EncGOP.cpp 7 additions, 0 deletions

source/Lib/EncoderLib/EncGOP.cpp
source/Lib/EncoderLib/VLCWriter.cpp 6 additions, 0 deletions

source/Lib/EncoderLib/VLCWriter.cpp

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