jamesxxiu
authored
Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/jamesxxiu/VVCSoftware_VTM into JVET_L0256_BIO # Conflicts: # source/Lib/CommonLib/TypeDef.h
Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/jamesxxiu/VVCSoftware_VTM into JVET_L0256_BIO # Conflicts: # source/Lib/CommonLib/TypeDef.h