Merge branch 'fixsaopic' into 'master'

Fix TestSAODisableAtPictureLevel=1: reset picture when SAO disabled for picture

See merge request jvet/VVCSoftware_VTM!2087

source/Lib/EncoderLib/EncSampleAdaptiveOffset.cpp

@@ -1098,6 +1098,8 @@ void EncSampleAdaptiveOffset::decideBlkParams(CodingStructure& cs, bool* sliceEn
       sliceEnabled[componentIndex] = false;
     }
     m_CABACEstimator->getCtx() = SAOCtx(ctxPicStart);
+
+    resYuv.copyFrom(srcYuv);
   }
 
   EncSampleAdaptiveOffset::disabledRate( cs, reconParams, saoEncodingRate, saoEncodingRateChroma );