Merge branch 'remove_macros_vtm21' into 'master'

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/App/EncoderApp/EncAppCfg.h

source/Lib/CommonLib/Picture.cpp

source/Lib/CommonLib/SEI.cpp

source/Lib/CommonLib/SEI.h

source/Lib/CommonLib/SEINeuralNetworkPostFiltering.cpp

source/Lib/CommonLib/SEINeuralNetworkPostFiltering.h

source/Lib/CommonLib/TypeDef.h

source/Lib/DecoderLib/DecLib.cpp

source/Lib/DecoderLib/SEIread.cpp

source/Lib/EncoderLib/EncCfg.h

source/Lib/EncoderLib/EncGOP.cpp

source/Lib/EncoderLib/EncGOP.h

source/Lib/EncoderLib/SEIEncoder.cpp

source/Lib/EncoderLib/SEIwrite.cpp