Merge branch 'master' into 'S0048'
# Conflicts: # source/Lib/CommonLib/TypeDef.h
Showing
- source/App/EncoderApp/EncAppCfg.cpp 1 addition, 0 deletionssource/App/EncoderApp/EncAppCfg.cpp
- source/Lib/CommonLib/CommonDef.h 4 additions, 0 deletionssource/Lib/CommonLib/CommonDef.h
- source/Lib/CommonLib/RdCost.cpp 13 additions, 0 deletionssource/Lib/CommonLib/RdCost.cpp
- source/Lib/CommonLib/RdCost.h 4 additions, 0 deletionssource/Lib/CommonLib/RdCost.h
- source/Lib/CommonLib/Slice.cpp 98 additions, 99 deletionssource/Lib/CommonLib/Slice.cpp
- source/Lib/CommonLib/TypeDef.h 14 additions, 0 deletionssource/Lib/CommonLib/TypeDef.h
- source/Lib/DecoderLib/DecCu.cpp 51 additions, 0 deletionssource/Lib/DecoderLib/DecCu.cpp
- source/Lib/DecoderLib/SEIread.cpp 58 additions, 1 deletionsource/Lib/DecoderLib/SEIread.cpp
- source/Lib/DecoderLib/VLCReader.cpp 19 additions, 2 deletionssource/Lib/DecoderLib/VLCReader.cpp
- source/Lib/EncoderLib/EncCu.cpp 4 additions, 1 deletionsource/Lib/EncoderLib/EncCu.cpp
- source/Lib/EncoderLib/EncGOP.cpp 45 additions, 0 deletionssource/Lib/EncoderLib/EncGOP.cpp
- source/Lib/EncoderLib/EncLib.cpp 26 additions, 0 deletionssource/Lib/EncoderLib/EncLib.cpp
- source/Lib/EncoderLib/EncSlice.cpp 4 additions, 1 deletionsource/Lib/EncoderLib/EncSlice.cpp
- source/Lib/EncoderLib/InterSearch.cpp 104 additions, 0 deletionssource/Lib/EncoderLib/InterSearch.cpp
- source/Lib/EncoderLib/IntraSearch.cpp 50 additions, 0 deletionssource/Lib/EncoderLib/IntraSearch.cpp
- source/Lib/EncoderLib/SEIwrite.cpp 12 additions, 0 deletionssource/Lib/EncoderLib/SEIwrite.cpp
- source/Lib/EncoderLib/VLCWriter.cpp 15 additions, 1 deletionsource/Lib/EncoderLib/VLCWriter.cpp
Loading
Please register or sign in to comment