Merge remote-tracking branch 'origin/safe-access'

author Moritz Bunkus <mo@bunkus.online>

Sun, 16 Oct 2022 11:05:16 +0000 (13:05 +0200)

committer Moritz Bunkus <mo@bunkus.online>

Sun, 16 Oct 2022 11:05:16 +0000 (13:05 +0200)
author Moritz Bunkus <mo@bunkus.online>
Sun, 16 Oct 2022 11:05:16 +0000 (13:05 +0200)
committer Moritz Bunkus <mo@bunkus.online>
Sun, 16 Oct 2022 11:05:16 +0000 (13:05 +0200)
diff --cc src/KaxBlock.cpp
Simple merge
diff --cc src/KaxCluster.cpp
Simple merge
author	Moritz Bunkus <mo@bunkus.online>
	Sun, 16 Oct 2022 11:05:16 +0000 (13:05 +0200)
committer	Moritz Bunkus <mo@bunkus.online>
	Sun, 16 Oct 2022 11:05:16 +0000 (13:05 +0200)
		1	2
src/KaxBlock.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/KaxCluster.cpp	patch \|	diff1 \|	diff2 \|	blob \| history