Merge branch 'checkLmcsAps' into 'master'

JVET-O0428: check lmcs aps id in multiple slices of same picture

See merge request jvet/VVCSoftware_VTM!931

source/Lib/DecoderLib/DecLib.cpp

@@ -1562,11 +1562,15 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
 
   if (pcSlice->getSPS()->getUseReshaper())
   {
+#if JVET_O0428_LMCS_CLEANUP
+    if (m_bFirstSliceInPicture)
+      m_sliceLmcsApsId = -1;
+#endif
     if (pcSlice->getLmcsEnabledFlag())
     {
       APS* lmcsAPS = pcSlice->getLmcsAPS();
 #if JVET_O0428_LMCS_CLEANUP
-      if (m_bFirstSliceInPicture)
+      if (m_sliceLmcsApsId == -1)
       {
         m_sliceLmcsApsId = lmcsAPS->getAPSId();
       }