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

df32f70c

Commit df32f70c authored 5 years ago by Frank Bossen

Downloads
- Plain Diff

Merge branch 'JVET_O1164_RPR' into 'master'

fix compiler error for JVET_O1164_RPR and ENABLE_SPLIT_PARALLELISM

See merge request jvet/VVCSoftware_VTM!882

parents be922e5f c1091a0a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/App/EncoderApp/EncAppCfg.cpp 1 addition, 1 deletion

source/App/EncoderApp/EncAppCfg.cpp
source/Lib/CommonLib/Picture.cpp 12 additions, 1 deletion

source/Lib/CommonLib/Picture.cpp
source/Lib/EncoderLib/EncGOP.cpp 2 additions, 2 deletions

source/Lib/EncoderLib/EncGOP.cpp
source/Lib/EncoderLib/EncLib.cpp 8 additions, 8 deletions

source/Lib/EncoderLib/EncLib.cpp

with 23 additions and 12 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