remove macro JVET_L0632_AFFINE_MERGE

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/App/EncoderApp/EncAppCfg.h

source/Lib/CommonLib/CommonDef.h

source/Lib/CommonLib/ContextModelling.h

source/Lib/CommonLib/Contexts.cpp

source/Lib/CommonLib/Contexts.h

source/Lib/CommonLib/Slice.cpp

source/Lib/CommonLib/Slice.h

source/Lib/CommonLib/TypeDef.h

source/Lib/CommonLib/UnitTools.cpp

source/Lib/CommonLib/UnitTools.h

source/Lib/CommonLib/dtrace_blockstatistics.cpp

source/Lib/DecoderLib/CABACReader.cpp

source/Lib/DecoderLib/DecCu.cpp

source/Lib/DecoderLib/VLCReader.cpp

source/Lib/EncoderLib/CABACWriter.cpp

source/Lib/EncoderLib/EncCfg.h

source/Lib/EncoderLib/EncCu.cpp

source/Lib/EncoderLib/EncSlice.cpp