Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

626b5d5e

Commit 626b5d5e authored 5 years ago by Biao Wang

Downloads
- Plain Diff

resolve merge conflicts

parents d9e7eb06 a39897cd

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

source/Lib/CommonLib/TypeDef.h
source/Lib/DecoderLib/VLCReader.cpp 16 additions, 7 deletions

source/Lib/DecoderLib/VLCReader.cpp
source/Lib/EncoderLib/VLCWriter.cpp 11 additions, 7 deletions

source/Lib/EncoderLib/VLCWriter.cpp

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