Merge branch 'master' into 'field_coding_fix'
# Conflicts: # source/Lib/CommonLib/TypeDef.h
Showing
- cfg/layers.cfg 19 additions, 0 deletionscfg/layers.cfg
- doc/software-manual.tex 11 additions, 0 deletionsdoc/software-manual.tex
- source/App/DecoderApp/DecApp.cpp 246 additions, 3 deletionssource/App/DecoderApp/DecApp.cpp
- source/App/DecoderApp/DecApp.h 5 additions, 0 deletionssource/App/DecoderApp/DecApp.h
- source/App/DecoderApp/DecAppCfg.cpp 9 additions, 1 deletionsource/App/DecoderApp/DecAppCfg.cpp
- source/App/DecoderApp/DecAppCfg.h 5 additions, 1 deletionsource/App/DecoderApp/DecAppCfg.h
- source/App/EncoderApp/EncApp.cpp 105 additions, 1 deletionsource/App/EncoderApp/EncApp.cpp
- source/App/EncoderApp/EncAppCfg.cpp 28 additions, 1 deletionsource/App/EncoderApp/EncAppCfg.cpp
- source/App/EncoderApp/EncAppCfg.h 18 additions, 0 deletionssource/App/EncoderApp/EncAppCfg.h
- source/App/StreamMergeApp/StreamMergeApp.cpp 2 additions, 1 deletionsource/App/StreamMergeApp/StreamMergeApp.cpp
- source/Lib/CommonLib/CommonDef.h 8 additions, 1 deletionsource/Lib/CommonLib/CommonDef.h
- source/Lib/CommonLib/InterPrediction.cpp 2 additions, 2 deletionssource/Lib/CommonLib/InterPrediction.cpp
- source/Lib/CommonLib/Picture.cpp 7 additions, 0 deletionssource/Lib/CommonLib/Picture.cpp
- source/Lib/CommonLib/Picture.h 4 additions, 0 deletionssource/Lib/CommonLib/Picture.h
- source/Lib/CommonLib/SEI.cpp 18 additions, 0 deletionssource/Lib/CommonLib/SEI.cpp
- source/Lib/CommonLib/SEI.h 42 additions, 0 deletionssource/Lib/CommonLib/SEI.h
- source/Lib/CommonLib/Slice.cpp 236 additions, 6 deletionssource/Lib/CommonLib/Slice.cpp
- source/Lib/CommonLib/Slice.h 132 additions, 5 deletionssource/Lib/CommonLib/Slice.h
- source/Lib/CommonLib/TypeDef.h 16 additions, 1 deletionsource/Lib/CommonLib/TypeDef.h
- source/Lib/CommonLib/UnitTools.cpp 2 additions, 2 deletionssource/Lib/CommonLib/UnitTools.cpp
Loading
Please register or sign in to comment