TEST ABI changes

Matroska-Org · Oct 8, 2022 · 1d132ed · 1d132ed
1 parent 350eead
commit 1d132ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
@@ -196,11 +196,11 @@ DECLARE_MKX_MASTER(KaxBlockGroup)
 
     operator KaxInternalBlock &();
 
-    const KaxCluster *GetParentCluster() const { return ParentCluster; }
+    const KaxCluster *GetParentCluster2() const { return ParentCluster; }
 
   protected:
-    KaxCluster * ParentCluster{nullptr};
-    const KaxTrackEntry * ParentTrack{nullptr};
+    KaxCluster * ParentCluster;
+    const KaxTrackEntry * ParentTrack;
 };
 
 class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary {
@@ -344,12 +344,12 @@ class MATROSKA_DLL_API KaxBlockBlob {
 
   bool ReplaceSimpleByGroup();
 protected:
-  KaxCluster *ParentCluster{nullptr};
+  KaxCluster *ParentCluster;
   union {
     KaxBlockGroup *group;
     KaxSimpleBlock *simpleblock;
   } Block;
-  bool bUseSimpleBlock;
+  bool bUseSimpleBlock{false};
   BlockBlobType SimpleBlockMode;
 };
 
@@ -369,8 +369,8 @@ DECLARE_MKX_BINARY_CONS(KaxBlockVirtual)
     filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) override;
 
   protected:
-    uint64 Timecode; // temporary timecode of the first frame if there are more than one
-    uint16 TrackNumber;
+    uint64 Timecode{0}; // temporary timecode of the first frame if there are more than one
+    uint16 TrackNumber{0};
     binary DataBlock[5];
 
     const KaxCluster * ParentCluster{nullptr};

diff --git a/src/KaxCuesData.cpp b/src/KaxCuesData.cpp
@@ -72,7 +72,7 @@ void KaxCuePoint::PositionSet(const KaxBlockGroup & BlockReference, uint64 Globa
   auto CodecState = static_cast<KaxCodecState *>(BlockReference.FindFirstElt(EBML_INFO(KaxCodecState)));
   if (CodecState != nullptr) {
     auto &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
-    *static_cast<EbmlUInteger*>(&CueCodecState) = BlockReference.GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
+    *static_cast<EbmlUInteger*>(&CueCodecState) = BlockReference.GetParentCluster2()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
   }
 
   SetValueIsSet();
@@ -123,7 +123,7 @@ void KaxCuePoint::PositionSet(const KaxInternalBlock & BlockReference, const Kax
     const auto CodecState = static_cast<const KaxCodecState *>(BlockGroup->FindFirstElt(EBML_INFO(KaxCodecState)));
     if (CodecState != nullptr) {
       auto &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
-      *static_cast<EbmlUInteger*>(&CueCodecState) = BlockGroup->GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
+      *static_cast<EbmlUInteger*>(&CueCodecState) = BlockGroup->GetParentCluster2()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
     }
   }