source/App/EncoderApp/EncAppCfg.h · 9248cfdfac6ae7236e39b8ef974ebbac43cd4210 · jvet / VVCSoftware_VTM · GitLab

Snippets Groups Projects

6 years ago
f578fcdb
Merge branch 'master' of https://vigitlab.fe.hhi.de/hinz/VVCSoftware_VTM into JVET-M0055 · f578fcdb
Tobias Hinz authored 6 years ago
```
# Conflicts:
#	source/Lib/CommonLib/CodingStructure.cpp
#	source/Lib/CommonLib/TypeDef.h
#	source/Lib/EncoderLib/EncSlice.cpp
```
f578fcdb

History
Merge branch 'master' of https://vigitlab.fe.hhi.de/hinz/VVCSoftware_VTM into JVET-M0055
Tobias Hinz authored 6 years ago
```
# Conflicts:
#	source/Lib/CommonLib/CodingStructure.cpp
#	source/Lib/CommonLib/TypeDef.h
#	source/Lib/EncoderLib/EncSlice.cpp
```