diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h index cebf88a0..65e950b5 100644 --- a/matroska/KaxBlock.h +++ b/matroska/KaxBlock.h @@ -184,10 +184,6 @@ class MATROSKA_DLL_API KaxInternalBlock : public libebml::EbmlBinary { {} KaxInternalBlock(const KaxInternalBlock & ElementToClone); ~KaxInternalBlock() override; - bool SizeIsValid(std::uint64_t size) const override - { - return size >= 4; /// for the moment - } static inline bool SizeIsValid(std::uint64_t size) { return size >= 4; /// for the moment diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index 34652cc8..13a49c6f 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -22,7 +22,7 @@ #include "matroska/KaxDefines.h" namespace libmatroska { -DECLARE_MKX_BINARY_LENGTH(KaxSeekID, 4) +DECLARE_MKX_BINARY(KaxSeekID) }; DECLARE_MKX_UINTEGER(KaxSeekPosition) @@ -31,25 +31,25 @@ DECLARE_MKX_UINTEGER(KaxSeekPosition) DECLARE_MKX_MASTER(KaxInfo) }; -DECLARE_MKX_BINARY_LENGTH(KaxSegmentUID, 16) +DECLARE_MKX_BINARY(KaxSegmentUID) }; DECLARE_MKX_UNISTRING(KaxSegmentFilename) }; -DECLARE_MKX_BINARY_LENGTH(KaxPrevUID, 16) +DECLARE_MKX_BINARY(KaxPrevUID) }; DECLARE_MKX_UNISTRING(KaxPrevFilename) }; -DECLARE_MKX_BINARY_LENGTH(KaxNextUID, 16) +DECLARE_MKX_BINARY(KaxNextUID) }; DECLARE_MKX_UNISTRING(KaxNextFilename) }; -DECLARE_MKX_BINARY_LENGTH(KaxSegmentFamily, 16) +DECLARE_MKX_BINARY(KaxSegmentFamily) }; DECLARE_MKX_MASTER(KaxChapterTranslate) @@ -386,7 +386,7 @@ DECLARE_MKX_UINTEGER_DEF(KaxVideoAspectRatio) libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override; }; -DECLARE_MKX_BINARY_LENGTH(KaxVideoColourSpace, 4) +DECLARE_MKX_BINARY(KaxVideoColourSpace) }; DECLARE_MKX_FLOAT(KaxVideoGamma) @@ -541,7 +541,7 @@ DECLARE_MKX_UINTEGER(KaxTrickTrackUID) libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override; }; -DECLARE_MKX_BINARY_LENGTH(KaxTrickTrackSegmentUID, 16) +DECLARE_MKX_BINARY(KaxTrickTrackSegmentUID) public: libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override; }; @@ -556,7 +556,7 @@ DECLARE_MKX_UINTEGER(KaxTrickMasterTrackUID) libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override; }; -DECLARE_MKX_BINARY_LENGTH(KaxTrickMasterTrackSegmentUID, 16) +DECLARE_MKX_BINARY(KaxTrickMasterTrackSegmentUID) public: libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override; }; @@ -743,7 +743,7 @@ DECLARE_MKX_UINTEGER_DEF(KaxChapterFlagHidden) DECLARE_MKX_UINTEGER_DEF(KaxChapterFlagEnabled) }; -DECLARE_MKX_BINARY_LENGTH(KaxChapterSegmentUID, 16) +DECLARE_MKX_BINARY(KaxChapterSegmentUID) }; DECLARE_MKX_UINTEGER(KaxChapterSkipType)