Merge remote-tracking branch 'neheb/2'

diff --cc matroska/KaxBlock.h
index 6dc6c20c7addf2a1c185059064ab89f23f5494d1,636a804d3a0a4b72c5877f283b86b0030d6bf8fc..c48c082ea8fc268ebe86998759c1e1689a1c1e1c
--- 1/matroska/KaxBlock.h
--- 2/matroska/KaxBlock.h
+++ b/matroska/KaxBlock.h
@@@ -376,9 -373,9 +373,9 @@@ DECLARE_MKX_BINARY_CONS(KaxBlockVirtual
      uint16 TrackNumber;
      binary DataBlock[5];
  
-     const KaxCluster * ParentCluster;
+     const KaxCluster * ParentCluster{nullptr};
  };
  
 -END_LIBMATROSKA_NAMESPACE
 +} // namespace libmatroska
  
  #endif // LIBMATROSKA_BLOCK_H

diff --cc matroska/KaxBlockData.h
Simple merge

diff --cc matroska/KaxCluster.h
Simple merge

diff --cc matroska/KaxCues.h
Simple merge

diff --cc matroska/KaxCuesData.h
Simple merge

diff --cc matroska/KaxInfoData.h
Simple merge

diff --cc matroska/KaxTracks.h
Simple merge

diff --cc src/FileKax.cpp
Simple merge

diff --cc src/KaxBlock.cpp
Simple merge

diff --cc src/KaxBlockData.cpp
Simple merge

diff --cc src/KaxCluster.cpp
Simple merge

diff --cc src/KaxCues.cpp
Simple merge

diff --cc src/KaxCuesData.cpp
Simple merge

diff --cc src/KaxSeekHead.cpp
Simple merge

diff --cc src/KaxTracks.cpp
Simple merge