Merge branch 'master' into 'JVET-P0615'
# Conflicts: # source/Lib/CommonLib/TypeDef.h
No related branches found
No related tags found
Showing
- source/App/DecoderApp/DecApp.cpp 2 additions, 2 deletionssource/App/DecoderApp/DecApp.cpp
- source/Lib/CommonLib/InterPrediction.cpp 4 additions, 3 deletionssource/Lib/CommonLib/InterPrediction.cpp
- source/Lib/CommonLib/Picture.h 13 additions, 0 deletionssource/Lib/CommonLib/Picture.h
- source/Lib/CommonLib/Slice.cpp 1 addition, 1 deletionsource/Lib/CommonLib/Slice.cpp
- source/Lib/CommonLib/Slice.h 8 additions, 0 deletionssource/Lib/CommonLib/Slice.h
- source/Lib/CommonLib/TypeDef.h 4 additions, 0 deletionssource/Lib/CommonLib/TypeDef.h
- source/Lib/CommonLib/UnitTools.cpp 8 additions, 8 deletionssource/Lib/CommonLib/UnitTools.cpp
- source/Lib/CommonLib/UnitTools.h 1 addition, 1 deletionsource/Lib/CommonLib/UnitTools.h
- source/Lib/DecoderLib/DecLib.cpp 6 additions, 0 deletionssource/Lib/DecoderLib/DecLib.cpp
- source/Lib/DecoderLib/VLCReader.cpp 52 additions, 0 deletionssource/Lib/DecoderLib/VLCReader.cpp
- source/Lib/EncoderLib/EncLib.cpp 45 additions, 0 deletionssource/Lib/EncoderLib/EncLib.cpp
- source/Lib/EncoderLib/VLCWriter.cpp 29 additions, 0 deletionssource/Lib/EncoderLib/VLCWriter.cpp
Loading
Please register or sign in to comment