JVET-AC0074: adopted constraints for NNPF frame rate upsampling

JVET-AC0074: adopted constraints for NNPF frame rate upsampling

source/Lib/CommonLib/SEINeuralNetworkPostFiltering.cpp

@@ -71,10 +71,12 @@ void SEINeuralNetworkPostFiltering::setPictureNnpfc(Picture* picture)
       }
     }
   }
-  
-  std::map<uint32_t, bool> isNnpfActivactedForPic;
-  isNnpfActivactedForPic.merge(m_isNnpfActiveForCLVS);
-  isNnpfActivactedForPic.merge(tmpIsNnpfActivatedForPic);
+
+  std::map<uint32_t, bool> isNnpfActivactedForPic = m_isNnpfActiveForCLVS;
+  for (auto it: tmpIsNnpfActivatedForPic)
+  {
+    isNnpfActivactedForPic.insert_or_assign(it.first, it.second);
+  }
   
   for (auto it : isNnpfActivactedForPic)
   {