Merge branch 'alf_macros' into 'master'

fix remaining compile issue for JVET_N0242_NON_LINEAR_ALF off

See merge request jvet/VVCSoftware_VTM!518

source/Lib/EncoderLib/EncAdaptiveLoopFilter.h

@@ -364,8 +364,10 @@ private:
   AlfSliceParam          m_alfSliceParamTempNL;
   int                    m_clipDefaultEnc[MAX_NUM_ALF_LUMA_COEFF];
   int                    m_filterTmp[MAX_NUM_ALF_LUMA_COEFF];
+#if JVET_N0242_NON_LINEAR_ALF
   int                    m_clipTmp[MAX_NUM_ALF_LUMA_COEFF];
 #endif
+#endif
 
 public:
   EncAdaptiveLoopFilter();