Merge branch 'removemacros1' into 'master'

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/App/EncoderApp/EncAppCfg.h

source/Lib/CommonLib/AdaptiveLoopFilter.cpp

source/Lib/CommonLib/AdaptiveLoopFilter.h

source/Lib/CommonLib/CodingStatistics.h

source/Lib/CommonLib/CodingStructure.cpp

source/Lib/CommonLib/CommonDef.h

source/Lib/CommonLib/ContextModelling.cpp

source/Lib/CommonLib/ContextModelling.h

source/Lib/CommonLib/Contexts.cpp

source/Lib/CommonLib/Contexts.h

source/Lib/CommonLib/DepQuant.cpp

source/Lib/CommonLib/DepQuant.h

source/Lib/CommonLib/InterPrediction.cpp

source/Lib/CommonLib/InterPrediction.h

source/Lib/CommonLib/InterpolationFilter.cpp

source/Lib/CommonLib/InterpolationFilter.h

source/Lib/CommonLib/IntraPrediction.cpp

source/Lib/CommonLib/IntraPrediction.h