Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit libmatroska for openSUSE:Factory
Hello community,

here is the log from the commit of package libmatroska for openSUSE:Factory
checked in at 2019-04-23 14:33:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmatroska (Old)
and /work/SRC/openSUSE:Factory/.libmatroska.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libmatroska"

Tue Apr 23 14:33:58 2019 rev:47 rq:696465 version:1.5.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/libmatroska/libmatroska.changes 2018-08-17
23:56:56.173794264 +0200
+++ /work/SRC/openSUSE:Factory/.libmatroska.new.5536/libmatroska.changes
2019-04-23 14:34:00.953383109 +0200
@@ -1,0 +2,6 @@
+Tue Apr 16 09:46:00 UTC 2019 - Ferdinand Thiessen <rpm@xxxxxxxxxxxx>
+
+- Update to 1.5.0:
+ * Compatibilty with libEBML 1.3.7
+
+-------------------------------------------------------------------

Old:
----
libmatroska-1.4.9.tar.xz

New:
----
libmatroska-1.5.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libmatroska.spec ++++++
--- /var/tmp/diff_new_pack.YMozYC/_old 2019-04-23 14:34:02.561384336 +0200
+++ /var/tmp/diff_new_pack.YMozYC/_new 2019-04-23 14:34:02.581384351 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libmatroska
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@

%define sover 6
Name: libmatroska
-Version: 1.4.9
+Version: 1.5.0
Release: 0
Summary: Library to Deal with Matroska Files
License: LGPL-2.1+
@@ -32,7 +32,7 @@
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libebml) >= 1.3.5
+BuildRequires: pkgconfig(libebml) >= 1.3.7
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description

++++++ libmatroska-1.4.9.tar.xz -> libmatroska-1.5.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/CMakeLists.txt
new/libmatroska-1.5.0/CMakeLists.txt
--- old/libmatroska-1.4.9/CMakeLists.txt 2018-04-20 20:28:50.000000000
+0200
+++ new/libmatroska-1.5.0/CMakeLists.txt 2019-03-12 20:54:34.000000000
+0100
@@ -1,12 +1,11 @@
cmake_minimum_required(VERSION 3.1.2)

-project(matroska VERSION 1.4.9)
+project(matroska VERSION 1.5.0)

option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation"
OFF)

-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
-find_package(Ebml 1.3.5 REQUIRED)
+find_package(Ebml 1.3.7 REQUIRED)

include(GNUInstallDirs)

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/ChangeLog
new/libmatroska-1.5.0/ChangeLog
--- old/libmatroska-1.4.9/ChangeLog 2018-04-20 20:28:50.000000000 +0200
+++ new/libmatroska-1.5.0/ChangeLog 2019-03-12 20:54:34.000000000 +0100
@@ -1,3 +1,14 @@
+2019-03-12 Moritz Bunkus <moritz@xxxxxxxxxx>
+
+ * Released v1.5.0.
+
+ * Build system: libEBML 1.3.7 is now required.
+
+2019-10-19 Matt Schulte <maschu@xxxxxxxxxxxxx>
+
+ * Build system: fixed a problem that prevented libMatroska from
+ being embedded in other builds.
+
2018-04-20 Moritz Bunkus <moritz@xxxxxxxxxx>

* Released v1.4.9.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/README.md
new/libmatroska-1.5.0/README.md
--- old/libmatroska-1.4.9/README.md 2018-04-20 20:28:50.000000000 +0200
+++ new/libmatroska-1.5.0/README.md 2019-03-12 20:54:34.000000000 +0100
@@ -22,7 +22,7 @@
installation paths (e.g. `-DCMAKE_INSTALL_PREFIX=/opt/libmatroska`). The
following additional `cmake` options are supported:

-* `-Debml_DIR=/path/to/libebml` — if `libebml` was installed in a
+* `-DEbml_DIR=/path/to/libebml` — if `libebml` was installed in a
non-default location, you have to tell `cmake` where to find
it. Point this variable to the directory containing the
`EbmlConfig.cmake` file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/libmatroska.proj
new/libmatroska-1.5.0/libmatroska.proj
--- old/libmatroska-1.4.9/libmatroska.proj 2018-04-20 20:28:50.000000000
+0200
+++ new/libmatroska-1.5.0/libmatroska.proj 2019-03-12 20:54:34.000000000
+0100
@@ -13,7 +13,7 @@

LIB matroska
{
- PROJECT_VERSION 1.4.9
+ PROJECT_VERSION 1.5.0
USE libmatroska_coremake_automake

INCLUDE .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/matroska/KaxBlock.h
new/libmatroska-1.5.0/matroska/KaxBlock.h
--- old/libmatroska-1.4.9/matroska/KaxBlock.h 2018-04-20 20:28:50.000000000
+0200
+++ new/libmatroska-1.5.0/matroska/KaxBlock.h 2019-03-12 20:54:34.000000000
+0100
@@ -286,7 +286,7 @@
bool bIsDiscardable;
};

-DECLARE_MKX_CONTEXT(KaxBlock);
+DECLARE_MKX_CONTEXT(KaxBlock)
class MATROSKA_DLL_API KaxBlock : public KaxInternalBlock {
public:
KaxBlock(EBML_EXTRA_PARAM)
:KaxInternalBlock(EBML_DEF_BINARY_CTX(KaxBlock)EBML_DEF_SEP false EBML_DEF_SEP
EBML_EXTRA_CALL) {}
@@ -294,7 +294,7 @@
};

#if MATROSKA_VERSION >= 2
-DECLARE_MKX_CONTEXT(KaxSimpleBlock);
+DECLARE_MKX_CONTEXT(KaxSimpleBlock)
class MATROSKA_DLL_API KaxSimpleBlock : public KaxInternalBlock {
public:
KaxSimpleBlock(EBML_EXTRA_PARAM)
:KaxInternalBlock(EBML_DEF_BINARY_CTX(KaxSimpleBlock)EBML_DEF_SEP true
EBML_DEF_SEP EBML_EXTRA_CALL) {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/matroska/KaxConfig.h
new/libmatroska-1.5.0/matroska/KaxConfig.h
--- old/libmatroska-1.4.9/matroska/KaxConfig.h 2018-04-20 20:28:50.000000000
+0200
+++ new/libmatroska-1.5.0/matroska/KaxConfig.h 2019-03-12 20:54:34.000000000
+0100
@@ -41,7 +41,7 @@
# define END_LIBMATROSKA_NAMESPACE
#else // NO_NAMESPACE
# define START_LIBMATROSKA_NAMESPACE namespace LIBMATROSKA_NAMESPACE {
-# define END_LIBMATROSKA_NAMESPACE };
+# define END_LIBMATROSKA_NAMESPACE }
#endif // NO_NAMESPACE

// There are special implementations for certain platforms. For example on
Windows
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/matroska/KaxInfoData.h
new/libmatroska-1.5.0/matroska/KaxInfoData.h
--- old/libmatroska-1.4.9/matroska/KaxInfoData.h 2018-04-20
20:28:50.000000000 +0200
+++ new/libmatroska-1.5.0/matroska/KaxInfoData.h 2019-03-12
20:54:34.000000000 +0100
@@ -51,7 +51,7 @@

START_LIBMATROSKA_NAMESPACE

-DECLARE_MKX_CONTEXT(KaxPrevUID);
+DECLARE_MKX_CONTEXT(KaxPrevUID)
class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID {
public:
KaxPrevUID(EBML_EXTRA_PARAM);
@@ -61,7 +61,7 @@
EBML_CONCRETE_CLASS(KaxPrevUID)
};

-DECLARE_MKX_CONTEXT(KaxNextUID);
+DECLARE_MKX_CONTEXT(KaxNextUID)
class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID {
public:
KaxNextUID(EBML_EXTRA_PARAM);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/matroska/KaxVersion.h
new/libmatroska-1.5.0/matroska/KaxVersion.h
--- old/libmatroska-1.4.9/matroska/KaxVersion.h 2018-04-20 20:28:50.000000000
+0200
+++ new/libmatroska-1.5.0/matroska/KaxVersion.h 2019-03-12 20:54:34.000000000
+0100
@@ -40,7 +40,7 @@

START_LIBMATROSKA_NAMESPACE

-#define LIBMATROSKA_VERSION 0x010409
+#define LIBMATROSKA_VERSION 0x010500

extern const std::string KaxCodeVersion;
extern const std::string KaxCodeDate;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/src/KaxSemantic.cpp
new/libmatroska-1.5.0/src/KaxSemantic.cpp
--- old/libmatroska-1.4.9/src/KaxSemantic.cpp 2018-04-20 20:28:50.000000000
+0200
+++ new/libmatroska-1.5.0/src/KaxSemantic.cpp 2019-03-12 20:54:34.000000000
+0100
@@ -53,22 +53,22 @@
DEFINE_SEMANTIC_ITEM(false, false, KaxTags)
DEFINE_END_SEMANTIC(KaxSegment)

-DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, "Segment");
+DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, "Segment")

DEFINE_START_SEMANTIC(KaxSeekHead)
DEFINE_SEMANTIC_ITEM(true, false, KaxSeek)
DEFINE_END_SEMANTIC(KaxSeekHead)

-DEFINE_MKX_MASTER(KaxSeekHead, 0x114D9B74, 4, KaxSegment, "SeekHeader");
+DEFINE_MKX_MASTER(KaxSeekHead, 0x114D9B74, 4, KaxSegment, "SeekHeader")

DEFINE_START_SEMANTIC(KaxSeek)
DEFINE_SEMANTIC_ITEM(true, true, KaxSeekID)
DEFINE_SEMANTIC_ITEM(true, true, KaxSeekPosition)
DEFINE_END_SEMANTIC(KaxSeek)

-DEFINE_MKX_MASTER(KaxSeek, 0x4DBB, 2, KaxSeekHead, "SeekPoint");
-DEFINE_MKX_BINARY (KaxSeekID, 0x53AB, 2, KaxSeek, "SeekID");
-DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition");
+DEFINE_MKX_MASTER(KaxSeek, 0x4DBB, 2, KaxSeekHead, "SeekPoint")
+DEFINE_MKX_BINARY (KaxSeekID, 0x53AB, 2, KaxSeek, "SeekID")
+DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition")

DEFINE_START_SEMANTIC(KaxInfo)
DEFINE_SEMANTIC_ITEM(false, true, KaxSegmentUID)
@@ -87,14 +87,14 @@
DEFINE_SEMANTIC_ITEM(true, true, KaxWritingApp)
DEFINE_END_SEMANTIC(KaxInfo)

-DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info");
-DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID");
-DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo,
"SegmentFilename");
-DEFINE_MKX_BINARY_CONS(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID");
-DEFINE_MKX_UNISTRING(KaxPrevFilename, 0x3C83AB, 3, KaxInfo, "PrevFilename");
-DEFINE_MKX_BINARY_CONS(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID");
-DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename");
-DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily");
+DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info")
+DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID")
+DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo, "SegmentFilename")
+DEFINE_MKX_BINARY_CONS(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID")
+DEFINE_MKX_UNISTRING(KaxPrevFilename, 0x3C83AB, 3, KaxInfo, "PrevFilename")
+DEFINE_MKX_BINARY_CONS(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID")
+DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename")
+DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily")

DEFINE_START_SEMANTIC(KaxChapterTranslate)
DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslateEditionUID)
@@ -102,16 +102,16 @@
DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateID)
DEFINE_END_SEMANTIC(KaxChapterTranslate)

-DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, "ChapterTranslate");
-DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2,
KaxChapterTranslate, "ChapterTranslateEditionUID");
-DEFINE_MKX_UINTEGER(KaxChapterTranslateCodec, 0x69BF, 2, KaxChapterTranslate,
"ChapterTranslateCodec");
-DEFINE_MKX_BINARY (KaxChapterTranslateID, 0x69A5, 2, KaxChapterTranslate,
"ChapterTranslateID");
-DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScale, 0x2AD7B1, 3, KaxInfo,
"TimecodeScale", 1000000);
-DEFINE_MKX_FLOAT(KaxDuration, 0x4489, 2, KaxInfo, "Duration");
-DEFINE_MKX_DATE (KaxDateUTC, 0x4461, 2, KaxInfo, "DateUTC");
-DEFINE_MKX_UNISTRING(KaxTitle, 0x7BA9, 2, KaxInfo, "Title");
-DEFINE_MKX_UNISTRING(KaxMuxingApp, 0x4D80, 2, KaxInfo, "MuxingApp");
-DEFINE_MKX_UNISTRING(KaxWritingApp, 0x5741, 2, KaxInfo, "WritingApp");
+DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, "ChapterTranslate")
+DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2,
KaxChapterTranslate, "ChapterTranslateEditionUID")
+DEFINE_MKX_UINTEGER(KaxChapterTranslateCodec, 0x69BF, 2, KaxChapterTranslate,
"ChapterTranslateCodec")
+DEFINE_MKX_BINARY (KaxChapterTranslateID, 0x69A5, 2, KaxChapterTranslate,
"ChapterTranslateID")
+DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScale, 0x2AD7B1, 3, KaxInfo,
"TimecodeScale", 1000000)
+DEFINE_MKX_FLOAT(KaxDuration, 0x4489, 2, KaxInfo, "Duration")
+DEFINE_MKX_DATE (KaxDateUTC, 0x4461, 2, KaxInfo, "DateUTC")
+DEFINE_MKX_UNISTRING(KaxTitle, 0x7BA9, 2, KaxInfo, "Title")
+DEFINE_MKX_UNISTRING(KaxMuxingApp, 0x4D80, 2, KaxInfo, "MuxingApp")
+DEFINE_MKX_UNISTRING(KaxWritingApp, 0x5741, 2, KaxInfo, "WritingApp")

DEFINE_START_SEMANTIC(KaxCluster)
DEFINE_SEMANTIC_ITEM(true, true, KaxClusterTimecode)
@@ -127,19 +127,19 @@
#endif // MATROSKA_VERSION
DEFINE_END_SEMANTIC(KaxCluster)

-DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster");
-DEFINE_MKX_UINTEGER(KaxClusterTimecode, 0xE7, 1, KaxCluster,
"ClusterTimecode");
+DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster")
+DEFINE_MKX_UINTEGER(KaxClusterTimecode, 0xE7, 1, KaxCluster, "ClusterTimecode")

DEFINE_START_SEMANTIC(KaxClusterSilentTracks)
DEFINE_SEMANTIC_ITEM(false, false, KaxClusterSilentTrackNumber)
DEFINE_END_SEMANTIC(KaxClusterSilentTracks)

-DEFINE_MKX_MASTER(KaxClusterSilentTracks, 0x5854, 2, KaxCluster,
"ClusterSilentTracks");
-DEFINE_MKX_UINTEGER(KaxClusterSilentTrackNumber, 0x58D7, 2,
KaxClusterSilentTracks, "ClusterSilentTrackNumber");
-DEFINE_MKX_UINTEGER(KaxClusterPosition, 0xA7, 1, KaxCluster,
"ClusterPosition");
-DEFINE_MKX_UINTEGER(KaxClusterPrevSize, 0xAB, 1, KaxCluster,
"ClusterPrevSize");
+DEFINE_MKX_MASTER(KaxClusterSilentTracks, 0x5854, 2, KaxCluster,
"ClusterSilentTracks")
+DEFINE_MKX_UINTEGER(KaxClusterSilentTrackNumber, 0x58D7, 2,
KaxClusterSilentTracks, "ClusterSilentTrackNumber")
+DEFINE_MKX_UINTEGER(KaxClusterPosition, 0xA7, 1, KaxCluster, "ClusterPosition")
+DEFINE_MKX_UINTEGER(KaxClusterPrevSize, 0xAB, 1, KaxCluster, "ClusterPrevSize")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY_CONS(KaxSimpleBlock, 0xA3, 1, KaxCluster, "SimpleBlock");
+DEFINE_MKX_BINARY_CONS(KaxSimpleBlock, 0xA3, 1, KaxCluster, "SimpleBlock")
#endif

DEFINE_START_SEMANTIC(KaxBlockGroup)
@@ -162,40 +162,40 @@
#endif // MATROSKA_VERSION
DEFINE_END_SEMANTIC(KaxBlockGroup)

-DEFINE_MKX_MASTER_CONS(KaxBlockGroup, 0xA0, 1, KaxCluster, "BlockGroup");
-DEFINE_MKX_BINARY_CONS(KaxBlock, 0xA1, 1, KaxBlockGroup, "Block");
+DEFINE_MKX_MASTER_CONS(KaxBlockGroup, 0xA0, 1, KaxCluster, "BlockGroup")
+DEFINE_MKX_BINARY_CONS(KaxBlock, 0xA1, 1, KaxBlockGroup, "Block")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY_CONS(KaxBlockVirtual, 0xA2, 1, KaxBlockGroup,
"BlockVirtual");
+DEFINE_MKX_BINARY_CONS(KaxBlockVirtual, 0xA2, 1, KaxBlockGroup, "BlockVirtual")
#endif

DEFINE_START_SEMANTIC(KaxBlockAdditions)
DEFINE_SEMANTIC_ITEM(true, false, KaxBlockMore)
DEFINE_END_SEMANTIC(KaxBlockAdditions)

-DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup,
"BlockAdditions");
+DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup,
"BlockAdditions")

DEFINE_START_SEMANTIC(KaxBlockMore)
DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddID)
DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAdditional)
DEFINE_END_SEMANTIC(KaxBlockMore)

-DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, "BlockMore");
-DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1);
-DEFINE_MKX_BINARY (KaxBlockAdditional, 0xA5, 1, KaxBlockMore,
"BlockAdditional");
-DEFINE_MKX_UINTEGER(KaxBlockDuration, 0x9B, 1, KaxBlockGroup, "BlockDuration");
-DEFINE_MKX_UINTEGER_DEF(KaxReferencePriority, 0xFA, 1, KaxBlockGroup,
"FlagReferenced", 0);
-DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup,
"ReferenceBlock");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_SINTEGER(KaxReferenceVirtual, 0xFD, 1, KaxBlockGroup,
"ReferenceVirtual");
-DEFINE_MKX_BINARY (KaxCodecState, 0xA4, 1, KaxBlockGroup, "CodecState");
-DEFINE_MKX_SINTEGER(KaxDiscardPadding, 0x75A2, 2, KaxBlockGroup,
"DiscardPadding");
+DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, "BlockMore")
+DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1)
+DEFINE_MKX_BINARY (KaxBlockAdditional, 0xA5, 1, KaxBlockMore,
"BlockAdditional")
+DEFINE_MKX_UINTEGER(KaxBlockDuration, 0x9B, 1, KaxBlockGroup, "BlockDuration")
+DEFINE_MKX_UINTEGER_DEF(KaxReferencePriority, 0xFA, 1, KaxBlockGroup,
"FlagReferenced", 0)
+DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup,
"ReferenceBlock")
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_SINTEGER(KaxReferenceVirtual, 0xFD, 1, KaxBlockGroup,
"ReferenceVirtual")
+DEFINE_MKX_BINARY (KaxCodecState, 0xA4, 1, KaxBlockGroup, "CodecState")
+DEFINE_MKX_SINTEGER(KaxDiscardPadding, 0x75A2, 2, KaxBlockGroup,
"DiscardPadding")
#endif

DEFINE_START_SEMANTIC(KaxSlices)
DEFINE_SEMANTIC_ITEM(false, false, KaxTimeSlice)
DEFINE_END_SEMANTIC(KaxSlices)

-DEFINE_MKX_MASTER(KaxSlices, 0x8E, 1, KaxBlockGroup, "Slices");
+DEFINE_MKX_MASTER(KaxSlices, 0x8E, 1, KaxBlockGroup, "Slices")

DEFINE_START_SEMANTIC(KaxTimeSlice)
DEFINE_SEMANTIC_ITEM(false, true, KaxSliceLaceNumber)
@@ -207,30 +207,30 @@
#endif // MATROSKA_VERSION
DEFINE_END_SEMANTIC(KaxTimeSlice)

-DEFINE_MKX_MASTER(KaxTimeSlice, 0xE8, 1, KaxSlices, "TimeSlice");
-DEFINE_MKX_UINTEGER_DEF(KaxSliceLaceNumber, 0xCC, 1, KaxTimeSlice,
"SliceLaceNumber", 0);
+DEFINE_MKX_MASTER(KaxTimeSlice, 0xE8, 1, KaxSlices, "TimeSlice")
+DEFINE_MKX_UINTEGER_DEF(KaxSliceLaceNumber, 0xCC, 1, KaxTimeSlice,
"SliceLaceNumber", 0)
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxSliceFrameNumber, 0xCD, 1, KaxTimeSlice,
"SliceFrameNumber", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxSliceBlockAddID, 0xCB, 1, KaxTimeSlice,
"SliceBlockAddID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxSliceDelay, 0xCE, 1, KaxTimeSlice, "SliceDelay", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxSliceDuration, 0xCF, 1, KaxTimeSlice,
"SliceDuration", 0);
+DEFINE_MKX_UINTEGER_DEF(KaxSliceFrameNumber, 0xCD, 1, KaxTimeSlice,
"SliceFrameNumber", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxSliceBlockAddID, 0xCB, 1, KaxTimeSlice,
"SliceBlockAddID", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxSliceDelay, 0xCE, 1, KaxTimeSlice, "SliceDelay", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxSliceDuration, 0xCF, 1, KaxTimeSlice,
"SliceDuration", 0)

DEFINE_START_SEMANTIC(KaxReferenceFrame)
DEFINE_SEMANTIC_ITEM(true, true, KaxReferenceOffset) // DivX specific
DEFINE_SEMANTIC_ITEM(true, true, KaxReferenceTimeCode) // DivX specific
DEFINE_END_SEMANTIC(KaxReferenceFrame)

-DEFINE_MKX_MASTER(KaxReferenceFrame, 0xC8, 1, KaxBlockGroup, "ReferenceFrame");
-DEFINE_MKX_UINTEGER(KaxReferenceOffset, 0xC9, 1, KaxReferenceFrame,
"ReferenceOffset");
-DEFINE_MKX_UINTEGER(KaxReferenceTimeCode, 0xCA, 1, KaxReferenceFrame,
"ReferenceTimeCode");
-DEFINE_MKX_BINARY (KaxEncryptedBlock, 0xAF, 1, KaxCluster, "EncryptedBlock");
+DEFINE_MKX_MASTER(KaxReferenceFrame, 0xC8, 1, KaxBlockGroup, "ReferenceFrame")
+DEFINE_MKX_UINTEGER(KaxReferenceOffset, 0xC9, 1, KaxReferenceFrame,
"ReferenceOffset")
+DEFINE_MKX_UINTEGER(KaxReferenceTimeCode, 0xCA, 1, KaxReferenceFrame,
"ReferenceTimeCode")
+DEFINE_MKX_BINARY (KaxEncryptedBlock, 0xAF, 1, KaxCluster, "EncryptedBlock")
#endif

DEFINE_START_SEMANTIC(KaxTracks)
DEFINE_SEMANTIC_ITEM(true, false, KaxTrackEntry)
DEFINE_END_SEMANTIC(KaxTracks)

-DEFINE_MKX_MASTER(KaxTracks, 0x1654AE6B, 4, KaxSegment, "Tracks");
+DEFINE_MKX_MASTER(KaxTracks, 0x1654AE6B, 4, KaxSegment, "Tracks")

DEFINE_START_SEMANTIC(KaxTrackEntry)
DEFINE_SEMANTIC_ITEM(true, true, KaxTrackNumber)
@@ -287,46 +287,46 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncodings)
DEFINE_END_SEMANTIC(KaxTrackEntry)

-DEFINE_MKX_MASTER_CONS(KaxTrackEntry, 0xAE, 1, KaxTracks, "TrackEntry");
-DEFINE_MKX_UINTEGER(KaxTrackNumber, 0xD7, 1, KaxTrackEntry, "TrackNumber");
-DEFINE_MKX_UINTEGER(KaxTrackUID, 0x73C5, 2, KaxTrackEntry, "TrackUID");
-DEFINE_MKX_UINTEGER(KaxTrackType, 0x83, 1, KaxTrackEntry, "TrackType");
+DEFINE_MKX_MASTER_CONS(KaxTrackEntry, 0xAE, 1, KaxTracks, "TrackEntry")
+DEFINE_MKX_UINTEGER(KaxTrackNumber, 0xD7, 1, KaxTrackEntry, "TrackNumber")
+DEFINE_MKX_UINTEGER(KaxTrackUID, 0x73C5, 2, KaxTrackEntry, "TrackUID")
+DEFINE_MKX_UINTEGER(KaxTrackType, 0x83, 1, KaxTrackEntry, "TrackType")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagEnabled, 0xB9, 1, KaxTrackEntry,
"TrackFlagEnabled", 1);
+DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagEnabled, 0xB9, 1, KaxTrackEntry,
"TrackFlagEnabled", 1)
#endif
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagDefault, 0x88, 1, KaxTrackEntry,
"TrackFlagDefault", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagForced, 0x55AA, 2, KaxTrackEntry,
"TrackFlagForced", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagLacing, 0x9C, 1, KaxTrackEntry,
"TrackFlagLacing", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxTrackMinCache, 0x6DE7, 2, KaxTrackEntry,
"TrackMinCache", 0);
-DEFINE_MKX_UINTEGER(KaxTrackMaxCache, 0x6DF8, 2, KaxTrackEntry,
"TrackMaxCache");
-DEFINE_MKX_UINTEGER(KaxTrackDefaultDuration, 0x23E383, 3, KaxTrackEntry,
"TrackDefaultDuration");
+DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagDefault, 0x88, 1, KaxTrackEntry,
"TrackFlagDefault", 1)
+DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagForced, 0x55AA, 2, KaxTrackEntry,
"TrackFlagForced", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagLacing, 0x9C, 1, KaxTrackEntry,
"TrackFlagLacing", 1)
+DEFINE_MKX_UINTEGER_DEF(KaxTrackMinCache, 0x6DE7, 2, KaxTrackEntry,
"TrackMinCache", 0)
+DEFINE_MKX_UINTEGER(KaxTrackMaxCache, 0x6DF8, 2, KaxTrackEntry,
"TrackMaxCache")
+DEFINE_MKX_UINTEGER(KaxTrackDefaultDuration, 0x23E383, 3, KaxTrackEntry,
"TrackDefaultDuration")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration, 0x234E7A, 3,
KaxTrackEntry, "TrackDefaultDecodedFieldDuration");
+DEFINE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration, 0x234E7A, 3,
KaxTrackEntry, "TrackDefaultDecodedFieldDuration")
#endif
-DEFINE_MKX_FLOAT_DEF(KaxTrackTimecodeScale, 0x23314F, 3, KaxTrackEntry,
"TrackTimecodeScale", 1);
+DEFINE_MKX_FLOAT_DEF(KaxTrackTimecodeScale, 0x23314F, 3, KaxTrackEntry,
"TrackTimecodeScale", 1)
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_SINTEGER_DEF(KaxTrackOffset, 0x537F, 2, KaxTrackEntry,
"TrackOffset", 0);
+DEFINE_MKX_SINTEGER_DEF(KaxTrackOffset, 0x537F, 2, KaxTrackEntry,
"TrackOffset", 0)
#endif
-DEFINE_MKX_UINTEGER_DEF(KaxMaxBlockAdditionID, 0x55EE, 2, KaxTrackEntry,
"MaxBlockAdditionID", 0);
-DEFINE_MKX_UNISTRING(KaxTrackName, 0x536E, 2, KaxTrackEntry, "TrackName");
-DEFINE_MKX_STRING_DEF(KaxTrackLanguage, 0x22B59C, 3, KaxTrackEntry,
"TrackLanguage", "eng");
+DEFINE_MKX_UINTEGER_DEF(KaxMaxBlockAdditionID, 0x55EE, 2, KaxTrackEntry,
"MaxBlockAdditionID", 0)
+DEFINE_MKX_UNISTRING(KaxTrackName, 0x536E, 2, KaxTrackEntry, "TrackName")
+DEFINE_MKX_STRING_DEF(KaxTrackLanguage, 0x22B59C, 3, KaxTrackEntry,
"TrackLanguage", "eng")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_STRING(KaxLanguageIETF, 0x22B59D, 3, KaxTrackEntry, "LanguageIETF");
+DEFINE_MKX_STRING(KaxLanguageIETF, 0x22B59D, 3, KaxTrackEntry, "LanguageIETF")
#endif
-DEFINE_MKX_STRING(KaxCodecID, 0x86, 1, KaxTrackEntry, "CodecID");
-DEFINE_MKX_BINARY (KaxCodecPrivate, 0x63A2, 2, KaxTrackEntry, "CodecPrivate");
-DEFINE_MKX_UNISTRING(KaxCodecName, 0x258688, 3, KaxTrackEntry, "CodecName");
-DEFINE_MKX_UINTEGER(KaxTrackAttachmentLink, 0x7446, 2, KaxTrackEntry,
"TrackAttachmentLink");
+DEFINE_MKX_STRING(KaxCodecID, 0x86, 1, KaxTrackEntry, "CodecID")
+DEFINE_MKX_BINARY (KaxCodecPrivate, 0x63A2, 2, KaxTrackEntry, "CodecPrivate")
+DEFINE_MKX_UNISTRING(KaxCodecName, 0x258688, 3, KaxTrackEntry, "CodecName")
+DEFINE_MKX_UINTEGER(KaxTrackAttachmentLink, 0x7446, 2, KaxTrackEntry,
"TrackAttachmentLink")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UNISTRING(KaxCodecSettings, 0x3A9697, 3, KaxTrackEntry,
"CodecSettings");
-DEFINE_MKX_STRING(KaxCodecInfoURL, 0x3B4040, 3, KaxTrackEntry, "CodecInfoURL");
-DEFINE_MKX_STRING(KaxCodecDownloadURL, 0x26B240, 3, KaxTrackEntry,
"CodecDownloadURL");
-DEFINE_MKX_UINTEGER_DEF(KaxCodecDecodeAll, 0xAA, 1, KaxTrackEntry,
"CodecDecodeAll", 1);
+DEFINE_MKX_UNISTRING(KaxCodecSettings, 0x3A9697, 3, KaxTrackEntry,
"CodecSettings")
+DEFINE_MKX_STRING(KaxCodecInfoURL, 0x3B4040, 3, KaxTrackEntry, "CodecInfoURL")
+DEFINE_MKX_STRING(KaxCodecDownloadURL, 0x26B240, 3, KaxTrackEntry,
"CodecDownloadURL")
+DEFINE_MKX_UINTEGER_DEF(KaxCodecDecodeAll, 0xAA, 1, KaxTrackEntry,
"CodecDecodeAll", 1)
#endif
-DEFINE_MKX_UINTEGER(KaxTrackOverlay, 0x6FAB, 2, KaxTrackEntry, "TrackOverlay");
+DEFINE_MKX_UINTEGER(KaxTrackOverlay, 0x6FAB, 2, KaxTrackEntry, "TrackOverlay")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxCodecDelay, 0x56AA, 2, KaxTrackEntry, "CodecDelay",
0);
-DEFINE_MKX_UINTEGER_DEF(KaxSeekPreRoll, 0x56BB, 2, KaxTrackEntry,
"SeekPreRoll", 0);
+DEFINE_MKX_UINTEGER_DEF(KaxCodecDelay, 0x56AA, 2, KaxTrackEntry, "CodecDelay",
0)
+DEFINE_MKX_UINTEGER_DEF(KaxSeekPreRoll, 0x56BB, 2, KaxTrackEntry,
"SeekPreRoll", 0)
#endif

DEFINE_START_SEMANTIC(KaxTrackTranslate)
@@ -335,10 +335,10 @@
DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTranslateTrackID)
DEFINE_END_SEMANTIC(KaxTrackTranslate)

-DEFINE_MKX_MASTER(KaxTrackTranslate, 0x6624, 2, KaxTrackEntry,
"TrackTranslate");
-DEFINE_MKX_UINTEGER(KaxTrackTranslateEditionUID, 0x66FC, 2, KaxTrackTranslate,
"TrackTranslateEditionUID");
-DEFINE_MKX_UINTEGER(KaxTrackTranslateCodec, 0x66BF, 2, KaxTrackTranslate,
"TrackTranslateCodec");
-DEFINE_MKX_BINARY (KaxTrackTranslateTrackID, 0x66A5, 2, KaxTrackTranslate,
"TrackTranslateTrackID");
+DEFINE_MKX_MASTER(KaxTrackTranslate, 0x6624, 2, KaxTrackEntry,
"TrackTranslate")
+DEFINE_MKX_UINTEGER(KaxTrackTranslateEditionUID, 0x66FC, 2, KaxTrackTranslate,
"TrackTranslateEditionUID")
+DEFINE_MKX_UINTEGER(KaxTrackTranslateCodec, 0x66BF, 2, KaxTrackTranslate,
"TrackTranslateCodec")
+DEFINE_MKX_BINARY (KaxTrackTranslateTrackID, 0x66A5, 2, KaxTrackTranslate,
"TrackTranslateTrackID")

DEFINE_START_SEMANTIC(KaxTrackVideo)
#if MATROSKA_VERSION >= 2
@@ -367,28 +367,28 @@
#endif // MATROSKA_VERSION
DEFINE_END_SEMANTIC(KaxTrackVideo)

-DEFINE_MKX_MASTER(KaxTrackVideo, 0xE0, 1, KaxTrackEntry, "TrackVideo");
+DEFINE_MKX_MASTER(KaxTrackVideo, 0xE0, 1, KaxTrackEntry, "TrackVideo")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxVideoFlagInterlaced, 0x9A, 1, KaxTrackVideo,
"VideoFlagInterlaced", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoFieldOrder, 0x9D, 1, KaxTrackVideo,
"VideoFieldOrder", 2);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoStereoMode, 0x53B8, 2, KaxTrackVideo,
"VideoStereoMode", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoAlphaMode, 0x53C0, 2, KaxTrackVideo,
"VideoAlphaMode", 0);
-DEFINE_MKX_UINTEGER(KaxOldStereoMode, 0x53B9, 2, KaxTrackVideo,
"OldStereoMode");
-#endif
-DEFINE_MKX_UINTEGER(KaxVideoPixelWidth, 0xB0, 1, KaxTrackVideo,
"VideoPixelWidth");
-DEFINE_MKX_UINTEGER(KaxVideoPixelHeight, 0xBA, 1, KaxTrackVideo,
"VideoPixelHeight");
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropBottom, 0x54AA, 2, KaxTrackVideo,
"VideoPixelCropBottom", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropTop, 0x54BB, 2, KaxTrackVideo,
"VideoPixelCropTop", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropLeft, 0x54CC, 2, KaxTrackVideo,
"VideoPixelCropLeft", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropRight, 0x54DD, 2, KaxTrackVideo,
"VideoPixelCropRight", 0);
-DEFINE_MKX_UINTEGER(KaxVideoDisplayWidth, 0x54B0, 2, KaxTrackVideo,
"VideoDisplayWidth");
-DEFINE_MKX_UINTEGER(KaxVideoDisplayHeight, 0x54BA, 2, KaxTrackVideo,
"VideoDisplayHeight");
-DEFINE_MKX_UINTEGER_DEF(KaxVideoDisplayUnit, 0x54B2, 2, KaxTrackVideo,
"VideoDisplayUnit", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoAspectRatio, 0x54B3, 2, KaxTrackVideo,
"VideoAspectRatio", 0);
-DEFINE_MKX_BINARY (KaxVideoColourSpace, 0x2EB524, 3, KaxTrackVideo,
"VideoColourSpace");
+DEFINE_MKX_UINTEGER_DEF(KaxVideoFlagInterlaced, 0x9A, 1, KaxTrackVideo,
"VideoFlagInterlaced", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoFieldOrder, 0x9D, 1, KaxTrackVideo,
"VideoFieldOrder", 2)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoStereoMode, 0x53B8, 2, KaxTrackVideo,
"VideoStereoMode", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoAlphaMode, 0x53C0, 2, KaxTrackVideo,
"VideoAlphaMode", 0)
+DEFINE_MKX_UINTEGER(KaxOldStereoMode, 0x53B9, 2, KaxTrackVideo,
"OldStereoMode")
+#endif
+DEFINE_MKX_UINTEGER(KaxVideoPixelWidth, 0xB0, 1, KaxTrackVideo,
"VideoPixelWidth")
+DEFINE_MKX_UINTEGER(KaxVideoPixelHeight, 0xBA, 1, KaxTrackVideo,
"VideoPixelHeight")
+DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropBottom, 0x54AA, 2, KaxTrackVideo,
"VideoPixelCropBottom", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropTop, 0x54BB, 2, KaxTrackVideo,
"VideoPixelCropTop", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropLeft, 0x54CC, 2, KaxTrackVideo,
"VideoPixelCropLeft", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropRight, 0x54DD, 2, KaxTrackVideo,
"VideoPixelCropRight", 0)
+DEFINE_MKX_UINTEGER(KaxVideoDisplayWidth, 0x54B0, 2, KaxTrackVideo,
"VideoDisplayWidth")
+DEFINE_MKX_UINTEGER(KaxVideoDisplayHeight, 0x54BA, 2, KaxTrackVideo,
"VideoDisplayHeight")
+DEFINE_MKX_UINTEGER_DEF(KaxVideoDisplayUnit, 0x54B2, 2, KaxTrackVideo,
"VideoDisplayUnit", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoAspectRatio, 0x54B3, 2, KaxTrackVideo,
"VideoAspectRatio", 0)
+DEFINE_MKX_BINARY (KaxVideoColourSpace, 0x2EB524, 3, KaxTrackVideo,
"VideoColourSpace")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_FLOAT(KaxVideoGamma, 0x2FB523, 3, KaxTrackVideo, "VideoGamma");
-DEFINE_MKX_FLOAT(KaxVideoFrameRate, 0x2383E3, 3, KaxTrackVideo,
"VideoFrameRate");
+DEFINE_MKX_FLOAT(KaxVideoGamma, 0x2FB523, 3, KaxTrackVideo, "VideoGamma")
+DEFINE_MKX_FLOAT(KaxVideoFrameRate, 0x2383E3, 3, KaxTrackVideo,
"VideoFrameRate")

DEFINE_START_SEMANTIC(KaxVideoColour)
DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMatrix)
@@ -407,20 +407,20 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMasterMeta)
DEFINE_END_SEMANTIC(KaxVideoColour)

-DEFINE_MKX_MASTER(KaxVideoColour, 0x55B0, 2, KaxTrackVideo, "VideoColour");
-DEFINE_MKX_UINTEGER_DEF(KaxVideoColourMatrix, 0x55B1, 2, KaxVideoColour,
"VideoColourMatrix", 2);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoBitsPerChannel, 0x55B2, 2, KaxVideoColour,
"VideoBitsPerChannel", 0);
-DEFINE_MKX_UINTEGER(KaxVideoChromaSubsampHorz, 0x55B3, 2, KaxVideoColour,
"VideoChromaSubsampHorz");
-DEFINE_MKX_UINTEGER(KaxVideoChromaSubsampVert, 0x55B4, 2, KaxVideoColour,
"VideoChromaSubsampVert");
-DEFINE_MKX_UINTEGER(KaxVideoCbSubsampHorz, 0x55B5, 2, KaxVideoColour,
"VideoCbSubsampHorz");
-DEFINE_MKX_UINTEGER(KaxVideoCbSubsampVert, 0x55B6, 2, KaxVideoColour,
"VideoCbSubsampVert");
-DEFINE_MKX_UINTEGER_DEF(KaxVideoChromaSitHorz, 0x55B7, 2, KaxVideoColour,
"VideoChromaSitHorz", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoChromaSitVert, 0x55B8, 2, KaxVideoColour,
"VideoChromaSitVert", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoColourRange, 0x55B9, 2, KaxVideoColour,
"VideoColourRange", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoColourTransferCharacter, 0x55BA, 2,
KaxVideoColour, "VideoColourTransferCharacter", 2);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoColourPrimaries, 0x55BB, 2, KaxVideoColour,
"VideoColourPrimaries", 2);
-DEFINE_MKX_UINTEGER(KaxVideoColourMaxCLL, 0x55BC, 2, KaxVideoColour,
"VideoColourMaxCLL");
-DEFINE_MKX_UINTEGER(KaxVideoColourMaxFALL, 0x55BD, 2, KaxVideoColour,
"VideoColourMaxFALL");
+DEFINE_MKX_MASTER(KaxVideoColour, 0x55B0, 2, KaxTrackVideo, "VideoColour")
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourMatrix, 0x55B1, 2, KaxVideoColour,
"VideoColourMatrix", 2)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoBitsPerChannel, 0x55B2, 2, KaxVideoColour,
"VideoBitsPerChannel", 0)
+DEFINE_MKX_UINTEGER(KaxVideoChromaSubsampHorz, 0x55B3, 2, KaxVideoColour,
"VideoChromaSubsampHorz")
+DEFINE_MKX_UINTEGER(KaxVideoChromaSubsampVert, 0x55B4, 2, KaxVideoColour,
"VideoChromaSubsampVert")
+DEFINE_MKX_UINTEGER(KaxVideoCbSubsampHorz, 0x55B5, 2, KaxVideoColour,
"VideoCbSubsampHorz")
+DEFINE_MKX_UINTEGER(KaxVideoCbSubsampVert, 0x55B6, 2, KaxVideoColour,
"VideoCbSubsampVert")
+DEFINE_MKX_UINTEGER_DEF(KaxVideoChromaSitHorz, 0x55B7, 2, KaxVideoColour,
"VideoChromaSitHorz", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoChromaSitVert, 0x55B8, 2, KaxVideoColour,
"VideoChromaSitVert", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourRange, 0x55B9, 2, KaxVideoColour,
"VideoColourRange", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourTransferCharacter, 0x55BA, 2,
KaxVideoColour, "VideoColourTransferCharacter", 2)
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourPrimaries, 0x55BB, 2, KaxVideoColour,
"VideoColourPrimaries", 2)
+DEFINE_MKX_UINTEGER(KaxVideoColourMaxCLL, 0x55BC, 2, KaxVideoColour,
"VideoColourMaxCLL")
+DEFINE_MKX_UINTEGER(KaxVideoColourMaxFALL, 0x55BD, 2, KaxVideoColour,
"VideoColourMaxFALL")

DEFINE_START_SEMANTIC(KaxVideoColourMasterMeta)
DEFINE_SEMANTIC_ITEM(false, true, KaxVideoRChromaX)
@@ -435,17 +435,17 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxVideoLuminanceMin)
DEFINE_END_SEMANTIC(KaxVideoColourMasterMeta)

-DEFINE_MKX_MASTER(KaxVideoColourMasterMeta, 0x55D0, 2, KaxVideoColour,
"VideoColourMasterMeta");
-DEFINE_MKX_FLOAT(KaxVideoRChromaX, 0x55D1, 2, KaxVideoColourMasterMeta,
"VideoRChromaX");
-DEFINE_MKX_FLOAT(KaxVideoRChromaY, 0x55D2, 2, KaxVideoColourMasterMeta,
"VideoRChromaY");
-DEFINE_MKX_FLOAT(KaxVideoGChromaX, 0x55D3, 2, KaxVideoColourMasterMeta,
"VideoGChromaX");
-DEFINE_MKX_FLOAT(KaxVideoGChromaY, 0x55D4, 2, KaxVideoColourMasterMeta,
"VideoGChromaY");
-DEFINE_MKX_FLOAT(KaxVideoBChromaX, 0x55D5, 2, KaxVideoColourMasterMeta,
"VideoBChromaX");
-DEFINE_MKX_FLOAT(KaxVideoBChromaY, 0x55D6, 2, KaxVideoColourMasterMeta,
"VideoBChromaY");
-DEFINE_MKX_FLOAT(KaxVideoWhitePointChromaX, 0x55D7, 2,
KaxVideoColourMasterMeta, "VideoWhitePointChromaX");
-DEFINE_MKX_FLOAT(KaxVideoWhitePointChromaY, 0x55D8, 2,
KaxVideoColourMasterMeta, "VideoWhitePointChromaY");
-DEFINE_MKX_FLOAT(KaxVideoLuminanceMax, 0x55D9, 2, KaxVideoColourMasterMeta,
"VideoLuminanceMax");
-DEFINE_MKX_FLOAT(KaxVideoLuminanceMin, 0x55DA, 2, KaxVideoColourMasterMeta,
"VideoLuminanceMin");
+DEFINE_MKX_MASTER(KaxVideoColourMasterMeta, 0x55D0, 2, KaxVideoColour,
"VideoColourMasterMeta")
+DEFINE_MKX_FLOAT(KaxVideoRChromaX, 0x55D1, 2, KaxVideoColourMasterMeta,
"VideoRChromaX")
+DEFINE_MKX_FLOAT(KaxVideoRChromaY, 0x55D2, 2, KaxVideoColourMasterMeta,
"VideoRChromaY")
+DEFINE_MKX_FLOAT(KaxVideoGChromaX, 0x55D3, 2, KaxVideoColourMasterMeta,
"VideoGChromaX")
+DEFINE_MKX_FLOAT(KaxVideoGChromaY, 0x55D4, 2, KaxVideoColourMasterMeta,
"VideoGChromaY")
+DEFINE_MKX_FLOAT(KaxVideoBChromaX, 0x55D5, 2, KaxVideoColourMasterMeta,
"VideoBChromaX")
+DEFINE_MKX_FLOAT(KaxVideoBChromaY, 0x55D6, 2, KaxVideoColourMasterMeta,
"VideoBChromaY")
+DEFINE_MKX_FLOAT(KaxVideoWhitePointChromaX, 0x55D7, 2,
KaxVideoColourMasterMeta, "VideoWhitePointChromaX")
+DEFINE_MKX_FLOAT(KaxVideoWhitePointChromaY, 0x55D8, 2,
KaxVideoColourMasterMeta, "VideoWhitePointChromaY")
+DEFINE_MKX_FLOAT(KaxVideoLuminanceMax, 0x55D9, 2, KaxVideoColourMasterMeta,
"VideoLuminanceMax")
+DEFINE_MKX_FLOAT(KaxVideoLuminanceMin, 0x55DA, 2, KaxVideoColourMasterMeta,
"VideoLuminanceMin")

DEFINE_START_SEMANTIC(KaxVideoProjection)
DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionType)
@@ -455,12 +455,12 @@
DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPoseRoll)
DEFINE_END_SEMANTIC(KaxVideoProjection)

-DEFINE_MKX_MASTER(KaxVideoProjection, 0x7670, 2, KaxTrackVideo,
"VideoProjection");
-DEFINE_MKX_UINTEGER_DEF(KaxVideoProjectionType, 0x7671, 2, KaxVideoProjection,
"VideoProjectionType", 0);
-DEFINE_MKX_BINARY (KaxVideoProjectionPrivate, 0x7672, 2, KaxVideoProjection,
"VideoProjectionPrivate");
-DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseYaw, 0x7673, 2, KaxVideoProjection,
"VideoProjectionPoseYaw", 0);
-DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPosePitch, 0x7674, 2,
KaxVideoProjection, "VideoProjectionPosePitch", 0);
-DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseRoll, 0x7675, 2,
KaxVideoProjection, "VideoProjectionPoseRoll", 0);
+DEFINE_MKX_MASTER(KaxVideoProjection, 0x7670, 2, KaxTrackVideo,
"VideoProjection")
+DEFINE_MKX_UINTEGER_DEF(KaxVideoProjectionType, 0x7671, 2, KaxVideoProjection,
"VideoProjectionType", 0)
+DEFINE_MKX_BINARY (KaxVideoProjectionPrivate, 0x7672, 2, KaxVideoProjection,
"VideoProjectionPrivate")
+DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseYaw, 0x7673, 2, KaxVideoProjection,
"VideoProjectionPoseYaw", 0)
+DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPosePitch, 0x7674, 2,
KaxVideoProjection, "VideoProjectionPosePitch", 0)
+DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseRoll, 0x7675, 2,
KaxVideoProjection, "VideoProjectionPoseRoll", 0)
#endif

DEFINE_START_SEMANTIC(KaxTrackAudio)
@@ -473,14 +473,14 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxAudioBitDepth)
DEFINE_END_SEMANTIC(KaxTrackAudio)

-DEFINE_MKX_MASTER(KaxTrackAudio, 0xE1, 1, KaxTrackEntry, "TrackAudio");
-DEFINE_MKX_FLOAT_DEF(KaxAudioSamplingFreq, 0xB5, 1, KaxTrackAudio,
"AudioSamplingFreq", 8000);
-DEFINE_MKX_FLOAT(KaxAudioOutputSamplingFreq, 0x78B5, 2, KaxTrackAudio,
"AudioOutputSamplingFreq");
-DEFINE_MKX_UINTEGER_DEF(KaxAudioChannels, 0x9F, 1, KaxTrackAudio,
"AudioChannels", 1);
+DEFINE_MKX_MASTER(KaxTrackAudio, 0xE1, 1, KaxTrackEntry, "TrackAudio")
+DEFINE_MKX_FLOAT_DEF(KaxAudioSamplingFreq, 0xB5, 1, KaxTrackAudio,
"AudioSamplingFreq", 8000)
+DEFINE_MKX_FLOAT(KaxAudioOutputSamplingFreq, 0x78B5, 2, KaxTrackAudio,
"AudioOutputSamplingFreq")
+DEFINE_MKX_UINTEGER_DEF(KaxAudioChannels, 0x9F, 1, KaxTrackAudio,
"AudioChannels", 1)
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY (KaxAudioPosition, 0x7D7B, 2, KaxTrackAudio,
"AudioPosition");
+DEFINE_MKX_BINARY (KaxAudioPosition, 0x7D7B, 2, KaxTrackAudio, "AudioPosition")
#endif
-DEFINE_MKX_UINTEGER(KaxAudioBitDepth, 0x6264, 2, KaxTrackAudio,
"AudioBitDepth");
+DEFINE_MKX_UINTEGER(KaxAudioBitDepth, 0x6264, 2, KaxTrackAudio,
"AudioBitDepth")
#if MATROSKA_VERSION >= 2

DEFINE_START_SEMANTIC(KaxTrackOperation)
@@ -488,41 +488,41 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxTrackJoinBlocks)
DEFINE_END_SEMANTIC(KaxTrackOperation)

-DEFINE_MKX_MASTER(KaxTrackOperation, 0xE2, 1, KaxTrackEntry, "TrackOperation");
+DEFINE_MKX_MASTER(KaxTrackOperation, 0xE2, 1, KaxTrackEntry, "TrackOperation")

DEFINE_START_SEMANTIC(KaxTrackCombinePlanes)
DEFINE_SEMANTIC_ITEM(true, false, KaxTrackPlane)
DEFINE_END_SEMANTIC(KaxTrackCombinePlanes)

-DEFINE_MKX_MASTER(KaxTrackCombinePlanes, 0xE3, 1, KaxTrackOperation,
"TrackCombinePlanes");
+DEFINE_MKX_MASTER(KaxTrackCombinePlanes, 0xE3, 1, KaxTrackOperation,
"TrackCombinePlanes")

DEFINE_START_SEMANTIC(KaxTrackPlane)
DEFINE_SEMANTIC_ITEM(true, true, KaxTrackPlaneUID)
DEFINE_SEMANTIC_ITEM(true, true, KaxTrackPlaneType)
DEFINE_END_SEMANTIC(KaxTrackPlane)

-DEFINE_MKX_MASTER(KaxTrackPlane, 0xE4, 1, KaxTrackCombinePlanes, "TrackPlane");
-DEFINE_MKX_UINTEGER(KaxTrackPlaneUID, 0xE5, 1, KaxTrackPlane, "TrackPlaneUID");
-DEFINE_MKX_UINTEGER(KaxTrackPlaneType, 0xE6, 1, KaxTrackPlane,
"TrackPlaneType");
+DEFINE_MKX_MASTER(KaxTrackPlane, 0xE4, 1, KaxTrackCombinePlanes, "TrackPlane")
+DEFINE_MKX_UINTEGER(KaxTrackPlaneUID, 0xE5, 1, KaxTrackPlane, "TrackPlaneUID")
+DEFINE_MKX_UINTEGER(KaxTrackPlaneType, 0xE6, 1, KaxTrackPlane,
"TrackPlaneType")

DEFINE_START_SEMANTIC(KaxTrackJoinBlocks)
DEFINE_SEMANTIC_ITEM(true, false, KaxTrackJoinUID)
DEFINE_END_SEMANTIC(KaxTrackJoinBlocks)

-DEFINE_MKX_MASTER(KaxTrackJoinBlocks, 0xE9, 1, KaxTrackOperation,
"TrackJoinBlocks");
-DEFINE_MKX_UINTEGER(KaxTrackJoinUID, 0xED, 1, KaxTrackJoinBlocks,
"TrackJoinUID");
-DEFINE_MKX_UINTEGER(KaxTrickTrackUID, 0xC0, 1, KaxTrackEntry, "TrickTrackUID");
-DEFINE_MKX_BINARY (KaxTrickTrackSegmentUID, 0xC1, 1, KaxTrackEntry,
"TrickTrackSegmentUID");
-DEFINE_MKX_UINTEGER_DEF(KaxTrickTrackFlag, 0xC6, 1, KaxTrackEntry,
"TrickTrackFlag", 0);
-DEFINE_MKX_UINTEGER(KaxTrickMasterTrackUID, 0xC7, 1, KaxTrackEntry,
"TrickMasterTrackUID");
-DEFINE_MKX_BINARY (KaxTrickMasterTrackSegmentUID, 0xC4, 1, KaxTrackEntry,
"TrickMasterTrackSegmentUID");
+DEFINE_MKX_MASTER(KaxTrackJoinBlocks, 0xE9, 1, KaxTrackOperation,
"TrackJoinBlocks")
+DEFINE_MKX_UINTEGER(KaxTrackJoinUID, 0xED, 1, KaxTrackJoinBlocks,
"TrackJoinUID")
+DEFINE_MKX_UINTEGER(KaxTrickTrackUID, 0xC0, 1, KaxTrackEntry, "TrickTrackUID")
+DEFINE_MKX_BINARY (KaxTrickTrackSegmentUID, 0xC1, 1, KaxTrackEntry,
"TrickTrackSegmentUID")
+DEFINE_MKX_UINTEGER_DEF(KaxTrickTrackFlag, 0xC6, 1, KaxTrackEntry,
"TrickTrackFlag", 0)
+DEFINE_MKX_UINTEGER(KaxTrickMasterTrackUID, 0xC7, 1, KaxTrackEntry,
"TrickMasterTrackUID")
+DEFINE_MKX_BINARY (KaxTrickMasterTrackSegmentUID, 0xC4, 1, KaxTrackEntry,
"TrickMasterTrackSegmentUID")
#endif

DEFINE_START_SEMANTIC(KaxContentEncodings)
DEFINE_SEMANTIC_ITEM(true, false, KaxContentEncoding)
DEFINE_END_SEMANTIC(KaxContentEncodings)

-DEFINE_MKX_MASTER(KaxContentEncodings, 0x6D80, 2, KaxTrackEntry,
"ContentEncodings");
+DEFINE_MKX_MASTER(KaxContentEncodings, 0x6D80, 2, KaxTrackEntry,
"ContentEncodings")

DEFINE_START_SEMANTIC(KaxContentEncoding)
DEFINE_SEMANTIC_ITEM(true, true, KaxContentEncodingOrder)
@@ -532,19 +532,19 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncryption)
DEFINE_END_SEMANTIC(KaxContentEncoding)

-DEFINE_MKX_MASTER(KaxContentEncoding, 0x6240, 2, KaxContentEncodings,
"ContentEncoding");
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingOrder, 0x5031, 2,
KaxContentEncoding, "ContentEncodingOrder", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingScope, 0x5032, 2,
KaxContentEncoding, "ContentEncodingScope", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingType, 0x5033, 2, KaxContentEncoding,
"ContentEncodingType", 0);
+DEFINE_MKX_MASTER(KaxContentEncoding, 0x6240, 2, KaxContentEncodings,
"ContentEncoding")
+DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingOrder, 0x5031, 2,
KaxContentEncoding, "ContentEncodingOrder", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingScope, 0x5032, 2,
KaxContentEncoding, "ContentEncodingScope", 1)
+DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingType, 0x5033, 2, KaxContentEncoding,
"ContentEncodingType", 0)

DEFINE_START_SEMANTIC(KaxContentCompression)
DEFINE_SEMANTIC_ITEM(true, true, KaxContentCompAlgo)
DEFINE_SEMANTIC_ITEM(false, true, KaxContentCompSettings)
DEFINE_END_SEMANTIC(KaxContentCompression)

-DEFINE_MKX_MASTER(KaxContentCompression, 0x5034, 2, KaxContentEncoding,
"ContentCompression");
-DEFINE_MKX_UINTEGER_DEF(KaxContentCompAlgo, 0x4254, 2, KaxContentCompression,
"ContentCompAlgo", 0);
-DEFINE_MKX_BINARY (KaxContentCompSettings, 0x4255, 2, KaxContentCompression,
"ContentCompSettings");
+DEFINE_MKX_MASTER(KaxContentCompression, 0x5034, 2, KaxContentEncoding,
"ContentCompression")
+DEFINE_MKX_UINTEGER_DEF(KaxContentCompAlgo, 0x4254, 2, KaxContentCompression,
"ContentCompAlgo", 0)
+DEFINE_MKX_BINARY (KaxContentCompSettings, 0x4255, 2, KaxContentCompression,
"ContentCompSettings")

DEFINE_START_SEMANTIC(KaxContentEncryption)
DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncAlgo)
@@ -555,27 +555,27 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigHashAlgo)
DEFINE_END_SEMANTIC(KaxContentEncryption)

-DEFINE_MKX_MASTER(KaxContentEncryption, 0x5035, 2, KaxContentEncoding,
"ContentEncryption");
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncAlgo, 0x47E1, 2, KaxContentEncryption,
"ContentEncAlgo", 0);
-DEFINE_MKX_BINARY (KaxContentEncKeyID, 0x47E2, 2, KaxContentEncryption,
"ContentEncKeyID");
-DEFINE_MKX_BINARY (KaxContentSignature, 0x47E3, 2, KaxContentEncryption,
"ContentSignature");
-DEFINE_MKX_BINARY (KaxContentSigKeyID, 0x47E4, 2, KaxContentEncryption,
"ContentSigKeyID");
-DEFINE_MKX_UINTEGER_DEF(KaxContentSigAlgo, 0x47E5, 2, KaxContentEncryption,
"ContentSigAlgo", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxContentSigHashAlgo, 0x47E6, 2,
KaxContentEncryption, "ContentSigHashAlgo", 0);
+DEFINE_MKX_MASTER(KaxContentEncryption, 0x5035, 2, KaxContentEncoding,
"ContentEncryption")
+DEFINE_MKX_UINTEGER_DEF(KaxContentEncAlgo, 0x47E1, 2, KaxContentEncryption,
"ContentEncAlgo", 0)
+DEFINE_MKX_BINARY (KaxContentEncKeyID, 0x47E2, 2, KaxContentEncryption,
"ContentEncKeyID")
+DEFINE_MKX_BINARY (KaxContentSignature, 0x47E3, 2, KaxContentEncryption,
"ContentSignature")
+DEFINE_MKX_BINARY (KaxContentSigKeyID, 0x47E4, 2, KaxContentEncryption,
"ContentSigKeyID")
+DEFINE_MKX_UINTEGER_DEF(KaxContentSigAlgo, 0x47E5, 2, KaxContentEncryption,
"ContentSigAlgo", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxContentSigHashAlgo, 0x47E6, 2,
KaxContentEncryption, "ContentSigHashAlgo", 0)

DEFINE_START_SEMANTIC(KaxCues)
DEFINE_SEMANTIC_ITEM(true, false, KaxCuePoint)
DEFINE_END_SEMANTIC(KaxCues)

-DEFINE_MKX_MASTER(KaxCues, 0x1C53BB6B, 4, KaxSegment, "Cues");
+DEFINE_MKX_MASTER(KaxCues, 0x1C53BB6B, 4, KaxSegment, "Cues")

DEFINE_START_SEMANTIC(KaxCuePoint)
DEFINE_SEMANTIC_ITEM(true, true, KaxCueTime)
DEFINE_SEMANTIC_ITEM(true, false, KaxCueTrackPositions)
DEFINE_END_SEMANTIC(KaxCuePoint)

-DEFINE_MKX_MASTER(KaxCuePoint, 0xBB, 1, KaxCues, "CuePoint");
-DEFINE_MKX_UINTEGER(KaxCueTime, 0xB3, 1, KaxCuePoint, "CueTime");
+DEFINE_MKX_MASTER(KaxCuePoint, 0xBB, 1, KaxCues, "CuePoint")
+DEFINE_MKX_UINTEGER(KaxCueTime, 0xB3, 1, KaxCuePoint, "CueTime")

DEFINE_START_SEMANTIC(KaxCueTrackPositions)
DEFINE_SEMANTIC_ITEM(true, true, KaxCueTrack)
@@ -591,16 +591,16 @@
#endif // MATROSKA_VERSION
DEFINE_END_SEMANTIC(KaxCueTrackPositions)

-DEFINE_MKX_MASTER(KaxCueTrackPositions, 0xB7, 1, KaxCuePoint,
"CueTrackPositions");
-DEFINE_MKX_UINTEGER(KaxCueTrack, 0xF7, 1, KaxCueTrackPositions, "CueTrack");
-DEFINE_MKX_UINTEGER(KaxCueClusterPosition, 0xF1, 1, KaxCueTrackPositions,
"CueClusterPosition");
+DEFINE_MKX_MASTER(KaxCueTrackPositions, 0xB7, 1, KaxCuePoint,
"CueTrackPositions")
+DEFINE_MKX_UINTEGER(KaxCueTrack, 0xF7, 1, KaxCueTrackPositions, "CueTrack")
+DEFINE_MKX_UINTEGER(KaxCueClusterPosition, 0xF1, 1, KaxCueTrackPositions,
"CueClusterPosition")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER(KaxCueRelativePosition, 0xF0, 1, KaxCueTrackPositions,
"CueRelativePosition");
-DEFINE_MKX_UINTEGER(KaxCueDuration, 0xB2, 1, KaxCueTrackPositions,
"CueDuration");
+DEFINE_MKX_UINTEGER(KaxCueRelativePosition, 0xF0, 1, KaxCueTrackPositions,
"CueRelativePosition")
+DEFINE_MKX_UINTEGER(KaxCueDuration, 0xB2, 1, KaxCueTrackPositions,
"CueDuration")
#endif
-DEFINE_MKX_UINTEGER_DEF(KaxCueBlockNumber, 0x5378, 2, KaxCueTrackPositions,
"CueBlockNumber", 1);
+DEFINE_MKX_UINTEGER_DEF(KaxCueBlockNumber, 0x5378, 2, KaxCueTrackPositions,
"CueBlockNumber", 1)
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxCueCodecState, 0xEA, 1, KaxCueTrackPositions,
"CueCodecState", 0);
+DEFINE_MKX_UINTEGER_DEF(KaxCueCodecState, 0xEA, 1, KaxCueTrackPositions,
"CueCodecState", 0)

DEFINE_START_SEMANTIC(KaxCueReference)
DEFINE_SEMANTIC_ITEM(true, true, KaxCueRefTime)
@@ -609,18 +609,18 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxCueRefCodecState) // not supported
DEFINE_END_SEMANTIC(KaxCueReference)

-DEFINE_MKX_MASTER(KaxCueReference, 0xDB, 1, KaxCueTrackPositions,
"CueReference");
-DEFINE_MKX_UINTEGER(KaxCueRefTime, 0x96, 1, KaxCueReference, "CueRefTime");
-DEFINE_MKX_UINTEGER(KaxCueRefCluster, 0x97, 1, KaxCueReference,
"CueRefCluster");
-DEFINE_MKX_UINTEGER_DEF(KaxCueRefNumber, 0x535F, 2, KaxCueReference,
"CueRefNumber", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxCueRefCodecState, 0xEB, 1, KaxCueReference,
"CueRefCodecState", 0);
+DEFINE_MKX_MASTER(KaxCueReference, 0xDB, 1, KaxCueTrackPositions,
"CueReference")
+DEFINE_MKX_UINTEGER(KaxCueRefTime, 0x96, 1, KaxCueReference, "CueRefTime")
+DEFINE_MKX_UINTEGER(KaxCueRefCluster, 0x97, 1, KaxCueReference,
"CueRefCluster")
+DEFINE_MKX_UINTEGER_DEF(KaxCueRefNumber, 0x535F, 2, KaxCueReference,
"CueRefNumber", 1)
+DEFINE_MKX_UINTEGER_DEF(KaxCueRefCodecState, 0xEB, 1, KaxCueReference,
"CueRefCodecState", 0)
#endif

DEFINE_START_SEMANTIC(KaxAttachments)
DEFINE_SEMANTIC_ITEM(true, false, KaxAttached)
DEFINE_END_SEMANTIC(KaxAttachments)

-DEFINE_MKX_MASTER_CONS(KaxAttachments, 0x1941A469, 4, KaxSegment,
"Attachments");
+DEFINE_MKX_MASTER_CONS(KaxAttachments, 0x1941A469, 4, KaxSegment,
"Attachments")

DEFINE_START_SEMANTIC(KaxAttached)
DEFINE_SEMANTIC_ITEM(false, true, KaxFileDescription)
@@ -635,23 +635,23 @@
#endif // MATROSKA_VERSION
DEFINE_END_SEMANTIC(KaxAttached)

-DEFINE_MKX_MASTER_CONS(KaxAttached, 0x61A7, 2, KaxAttachments, "AttachedFile");
-DEFINE_MKX_UNISTRING(KaxFileDescription, 0x467E, 2, KaxAttached,
"FileDescription");
-DEFINE_MKX_UNISTRING(KaxFileName, 0x466E, 2, KaxAttached, "FileName");
-DEFINE_MKX_STRING(KaxMimeType, 0x4660, 2, KaxAttached, "FileMimeType");
-DEFINE_MKX_BINARY (KaxFileData, 0x465C, 2, KaxAttached, "FileData");
-DEFINE_MKX_UINTEGER(KaxFileUID, 0x46AE, 2, KaxAttached, "FileUID");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY (KaxFileReferral, 0x4675, 2, KaxAttached, "FileReferral");
-DEFINE_MKX_UINTEGER(KaxFileUsedStartTime, 0x4661, 2, KaxAttached,
"FileUsedStartTime");
-DEFINE_MKX_UINTEGER(KaxFileUsedEndTime, 0x4662, 2, KaxAttached,
"FileUsedEndTime");
+DEFINE_MKX_MASTER_CONS(KaxAttached, 0x61A7, 2, KaxAttachments, "AttachedFile")
+DEFINE_MKX_UNISTRING(KaxFileDescription, 0x467E, 2, KaxAttached,
"FileDescription")
+DEFINE_MKX_UNISTRING(KaxFileName, 0x466E, 2, KaxAttached, "FileName")
+DEFINE_MKX_STRING(KaxMimeType, 0x4660, 2, KaxAttached, "FileMimeType")
+DEFINE_MKX_BINARY (KaxFileData, 0x465C, 2, KaxAttached, "FileData")
+DEFINE_MKX_UINTEGER(KaxFileUID, 0x46AE, 2, KaxAttached, "FileUID")
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_BINARY (KaxFileReferral, 0x4675, 2, KaxAttached, "FileReferral")
+DEFINE_MKX_UINTEGER(KaxFileUsedStartTime, 0x4661, 2, KaxAttached,
"FileUsedStartTime")
+DEFINE_MKX_UINTEGER(KaxFileUsedEndTime, 0x4662, 2, KaxAttached,
"FileUsedEndTime")
#endif

DEFINE_START_SEMANTIC(KaxChapters)
DEFINE_SEMANTIC_ITEM(true, false, KaxEditionEntry)
DEFINE_END_SEMANTIC(KaxChapters)

-DEFINE_MKX_MASTER(KaxChapters, 0x1043A770, 4, KaxSegment, "Chapters");
+DEFINE_MKX_MASTER(KaxChapters, 0x1043A770, 4, KaxSegment, "Chapters")

DEFINE_START_SEMANTIC(KaxEditionEntry)
DEFINE_SEMANTIC_ITEM(false, true, KaxEditionUID)
@@ -661,11 +661,11 @@
DEFINE_SEMANTIC_ITEM(true, false, KaxChapterAtom)
DEFINE_END_SEMANTIC(KaxEditionEntry)

-DEFINE_MKX_MASTER(KaxEditionEntry, 0x45B9, 2, KaxChapters, "EditionEntry");
-DEFINE_MKX_UINTEGER(KaxEditionUID, 0x45BC, 2, KaxEditionEntry, "EditionUID");
-DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagHidden, 0x45BD, 2, KaxEditionEntry,
"EditionFlagHidden", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagDefault, 0x45DB, 2, KaxEditionEntry,
"EditionFlagDefault", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagOrdered, 0x45DD, 2, KaxEditionEntry,
"EditionFlagOrdered", 0);
+DEFINE_MKX_MASTER(KaxEditionEntry, 0x45B9, 2, KaxChapters, "EditionEntry")
+DEFINE_MKX_UINTEGER(KaxEditionUID, 0x45BC, 2, KaxEditionEntry, "EditionUID")
+DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagHidden, 0x45BD, 2, KaxEditionEntry,
"EditionFlagHidden", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagDefault, 0x45DB, 2, KaxEditionEntry,
"EditionFlagDefault", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagOrdered, 0x45DD, 2, KaxEditionEntry,
"EditionFlagOrdered", 0)

DEFINE_START_SEMANTIC(KaxChapterAtom)
DEFINE_SEMANTIC_ITEM(false, false, KaxChapterAtom) // recursive
@@ -685,25 +685,25 @@
DEFINE_SEMANTIC_ITEM(false, false, KaxChapterProcess)
DEFINE_END_SEMANTIC(KaxChapterAtom)

-DEFINE_MKX_MASTER(KaxChapterAtom, 0xB6, 1, KaxEditionEntry, "ChapterAtom");
-DEFINE_MKX_UINTEGER(KaxChapterUID, 0x73C4, 2, KaxChapterAtom, "ChapterUID");
+DEFINE_MKX_MASTER(KaxChapterAtom, 0xB6, 1, KaxEditionEntry, "ChapterAtom")
+DEFINE_MKX_UINTEGER(KaxChapterUID, 0x73C4, 2, KaxChapterAtom, "ChapterUID")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UNISTRING(KaxChapterStringUID, 0x5654, 2, KaxChapterAtom,
"ChapterStringUID");
+DEFINE_MKX_UNISTRING(KaxChapterStringUID, 0x5654, 2, KaxChapterAtom,
"ChapterStringUID")
#endif
-DEFINE_MKX_UINTEGER(KaxChapterTimeStart, 0x91, 1, KaxChapterAtom,
"ChapterTimeStart");
-DEFINE_MKX_UINTEGER(KaxChapterTimeEnd, 0x92, 1, KaxChapterAtom,
"ChapterTimeEnd");
-DEFINE_MKX_UINTEGER_DEF(KaxChapterFlagHidden, 0x98, 1, KaxChapterAtom,
"ChapterFlagHidden", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxChapterFlagEnabled, 0x4598, 2, KaxChapterAtom,
"ChapterFlagEnabled", 1);
-DEFINE_MKX_BINARY (KaxChapterSegmentUID, 0x6E67, 2, KaxChapterAtom,
"ChapterSegmentUID");
-DEFINE_MKX_UINTEGER(KaxChapterSegmentEditionUID, 0x6EBC, 2, KaxChapterAtom,
"ChapterSegmentEditionUID");
-DEFINE_MKX_UINTEGER(KaxChapterPhysicalEquiv, 0x63C3, 2, KaxChapterAtom,
"ChapterPhysicalEquiv");
+DEFINE_MKX_UINTEGER(KaxChapterTimeStart, 0x91, 1, KaxChapterAtom,
"ChapterTimeStart")
+DEFINE_MKX_UINTEGER(KaxChapterTimeEnd, 0x92, 1, KaxChapterAtom,
"ChapterTimeEnd")
+DEFINE_MKX_UINTEGER_DEF(KaxChapterFlagHidden, 0x98, 1, KaxChapterAtom,
"ChapterFlagHidden", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxChapterFlagEnabled, 0x4598, 2, KaxChapterAtom,
"ChapterFlagEnabled", 1)
+DEFINE_MKX_BINARY (KaxChapterSegmentUID, 0x6E67, 2, KaxChapterAtom,
"ChapterSegmentUID")
+DEFINE_MKX_UINTEGER(KaxChapterSegmentEditionUID, 0x6EBC, 2, KaxChapterAtom,
"ChapterSegmentEditionUID")
+DEFINE_MKX_UINTEGER(KaxChapterPhysicalEquiv, 0x63C3, 2, KaxChapterAtom,
"ChapterPhysicalEquiv")

DEFINE_START_SEMANTIC(KaxChapterTrack)
DEFINE_SEMANTIC_ITEM(true, false, KaxChapterTrackNumber)
DEFINE_END_SEMANTIC(KaxChapterTrack)

-DEFINE_MKX_MASTER(KaxChapterTrack, 0x8F, 1, KaxChapterAtom, "ChapterTrack");
-DEFINE_MKX_UINTEGER(KaxChapterTrackNumber, 0x89, 1, KaxChapterTrack,
"ChapterTrackNumber");
+DEFINE_MKX_MASTER(KaxChapterTrack, 0x8F, 1, KaxChapterAtom, "ChapterTrack")
+DEFINE_MKX_UINTEGER(KaxChapterTrackNumber, 0x89, 1, KaxChapterTrack,
"ChapterTrackNumber")

DEFINE_START_SEMANTIC(KaxChapterDisplay)
DEFINE_SEMANTIC_ITEM(true, true, KaxChapterString)
@@ -714,13 +714,13 @@
DEFINE_SEMANTIC_ITEM(false, false, KaxChapterCountry)
DEFINE_END_SEMANTIC(KaxChapterDisplay)

-DEFINE_MKX_MASTER(KaxChapterDisplay, 0x80, 1, KaxChapterAtom,
"ChapterDisplay");
-DEFINE_MKX_UNISTRING(KaxChapterString, 0x85, 1, KaxChapterDisplay,
"ChapterString");
-DEFINE_MKX_STRING_DEF(KaxChapterLanguage, 0x437C, 2, KaxChapterDisplay,
"ChapterLanguage", "eng");
+DEFINE_MKX_MASTER(KaxChapterDisplay, 0x80, 1, KaxChapterAtom, "ChapterDisplay")
+DEFINE_MKX_UNISTRING(KaxChapterString, 0x85, 1, KaxChapterDisplay,
"ChapterString")
+DEFINE_MKX_STRING_DEF(KaxChapterLanguage, 0x437C, 2, KaxChapterDisplay,
"ChapterLanguage", "eng")
#if MATROSKA_VERSION >= 2
-DEFINE_MKX_STRING(KaxChapLanguageIETF, 0x437D, 2, KaxChapterDisplay,
"ChapLanguageIETF");
+DEFINE_MKX_STRING(KaxChapLanguageIETF, 0x437D, 2, KaxChapterDisplay,
"ChapLanguageIETF")
#endif
-DEFINE_MKX_STRING(KaxChapterCountry, 0x437E, 2, KaxChapterDisplay,
"ChapterCountry");
+DEFINE_MKX_STRING(KaxChapterCountry, 0x437E, 2, KaxChapterDisplay,
"ChapterCountry")

DEFINE_START_SEMANTIC(KaxChapterProcess)
DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessCodecID)
@@ -728,31 +728,31 @@
DEFINE_SEMANTIC_ITEM(false, false, KaxChapterProcessCommand)
DEFINE_END_SEMANTIC(KaxChapterProcess)

-DEFINE_MKX_MASTER(KaxChapterProcess, 0x6944, 2, KaxChapterAtom,
"ChapterProcess");
-DEFINE_MKX_UINTEGER_DEF(KaxChapterProcessCodecID, 0x6955, 2,
KaxChapterProcess, "ChapterProcessCodecID", 0);
-DEFINE_MKX_BINARY (KaxChapterProcessPrivate, 0x450D, 2, KaxChapterProcess,
"ChapterProcessPrivate");
+DEFINE_MKX_MASTER(KaxChapterProcess, 0x6944, 2, KaxChapterAtom,
"ChapterProcess")
+DEFINE_MKX_UINTEGER_DEF(KaxChapterProcessCodecID, 0x6955, 2,
KaxChapterProcess, "ChapterProcessCodecID", 0)
+DEFINE_MKX_BINARY (KaxChapterProcessPrivate, 0x450D, 2, KaxChapterProcess,
"ChapterProcessPrivate")

DEFINE_START_SEMANTIC(KaxChapterProcessCommand)
DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessTime)
DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessData)
DEFINE_END_SEMANTIC(KaxChapterProcessCommand)

-DEFINE_MKX_MASTER(KaxChapterProcessCommand, 0x6911, 2, KaxChapterProcess,
"ChapterProcessCommand");
-DEFINE_MKX_UINTEGER(KaxChapterProcessTime, 0x6922, 2,
KaxChapterProcessCommand, "ChapterProcessTime");
-DEFINE_MKX_BINARY (KaxChapterProcessData, 0x6933, 2, KaxChapterProcessCommand,
"ChapterProcessData");
+DEFINE_MKX_MASTER(KaxChapterProcessCommand, 0x6911, 2, KaxChapterProcess,
"ChapterProcessCommand")
+DEFINE_MKX_UINTEGER(KaxChapterProcessTime, 0x6922, 2,
KaxChapterProcessCommand, "ChapterProcessTime")
+DEFINE_MKX_BINARY (KaxChapterProcessData, 0x6933, 2, KaxChapterProcessCommand,
"ChapterProcessData")

DEFINE_START_SEMANTIC(KaxTags)
DEFINE_SEMANTIC_ITEM(true, false, KaxTag)
DEFINE_END_SEMANTIC(KaxTags)

-DEFINE_MKX_MASTER(KaxTags, 0x1254C367, 4, KaxSegment, "Tags");
+DEFINE_MKX_MASTER(KaxTags, 0x1254C367, 4, KaxSegment, "Tags")

DEFINE_START_SEMANTIC(KaxTag)
DEFINE_SEMANTIC_ITEM(true, true, KaxTagTargets)
DEFINE_SEMANTIC_ITEM(true, false, KaxTagSimple)
DEFINE_END_SEMANTIC(KaxTag)

-DEFINE_MKX_MASTER(KaxTag, 0x7373, 2, KaxTags, "Tag");
+DEFINE_MKX_MASTER(KaxTag, 0x7373, 2, KaxTags, "Tag")

DEFINE_START_SEMANTIC(KaxTagTargets)
DEFINE_SEMANTIC_ITEM(false, true, KaxTagTargetTypeValue)
@@ -763,13 +763,13 @@
DEFINE_SEMANTIC_ITEM(false, false, KaxTagAttachmentUID)
DEFINE_END_SEMANTIC(KaxTagTargets)

-DEFINE_MKX_MASTER(KaxTagTargets, 0x63C0, 2, KaxTag, "TagTargets");
-DEFINE_MKX_UINTEGER_DEF(KaxTagTargetTypeValue, 0x68CA, 2, KaxTagTargets,
"TagTargetTypeValue", 50);
-DEFINE_MKX_STRING(KaxTagTargetType, 0x63CA, 2, KaxTagTargets, "TagTargetType");
-DEFINE_MKX_UINTEGER_DEF(KaxTagTrackUID, 0x63C5, 2, KaxTagTargets,
"TagTrackUID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTagEditionUID, 0x63C9, 2, KaxTagTargets,
"TagEditionUID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTagChapterUID, 0x63C4, 2, KaxTagTargets,
"TagChapterUID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTagAttachmentUID, 0x63C6, 2, KaxTagTargets,
"TagAttachmentUID", 0);
+DEFINE_MKX_MASTER(KaxTagTargets, 0x63C0, 2, KaxTag, "TagTargets")
+DEFINE_MKX_UINTEGER_DEF(KaxTagTargetTypeValue, 0x68CA, 2, KaxTagTargets,
"TagTargetTypeValue", 50)
+DEFINE_MKX_STRING(KaxTagTargetType, 0x63CA, 2, KaxTagTargets, "TagTargetType")
+DEFINE_MKX_UINTEGER_DEF(KaxTagTrackUID, 0x63C5, 2, KaxTagTargets,
"TagTrackUID", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxTagEditionUID, 0x63C9, 2, KaxTagTargets,
"TagEditionUID", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxTagChapterUID, 0x63C4, 2, KaxTagTargets,
"TagChapterUID", 0)
+DEFINE_MKX_UINTEGER_DEF(KaxTagAttachmentUID, 0x63C6, 2, KaxTagTargets,
"TagAttachmentUID", 0)

DEFINE_START_SEMANTIC(KaxTagSimple)
DEFINE_SEMANTIC_ITEM(false, false, KaxTagSimple) // recursive
@@ -783,15 +783,15 @@
DEFINE_SEMANTIC_ITEM(false, true, KaxTagBinary)
DEFINE_END_SEMANTIC(KaxTagSimple)

-DEFINE_MKX_MASTER(KaxTagSimple, 0x67C8, 2, KaxTag, "TagSimple");
-DEFINE_MKX_UNISTRING(KaxTagName, 0x45A3, 2, KaxTagSimple, "TagName");
-DEFINE_MKX_STRING_DEF(KaxTagLangue, 0x447A, 2, KaxTagSimple, "TagLanguage",
"und");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_STRING(KaxTagLanguageIETF, 0x447B, 2, KaxTagSimple,
"TagLanguageIETF");
-#endif
-DEFINE_MKX_UINTEGER_DEF(KaxTagDefault, 0x4484, 2, KaxTagSimple, "TagDefault",
1);
-DEFINE_MKX_UNISTRING(KaxTagString, 0x4487, 2, KaxTagSimple, "TagString");
-DEFINE_MKX_BINARY (KaxTagBinary, 0x4485, 2, KaxTagSimple, "TagBinary");
+DEFINE_MKX_MASTER(KaxTagSimple, 0x67C8, 2, KaxTag, "TagSimple")
+DEFINE_MKX_UNISTRING(KaxTagName, 0x45A3, 2, KaxTagSimple, "TagName")
+DEFINE_MKX_STRING_DEF(KaxTagLangue, 0x447A, 2, KaxTagSimple, "TagLanguage",
"und")
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_STRING(KaxTagLanguageIETF, 0x447B, 2, KaxTagSimple,
"TagLanguageIETF")
+#endif
+DEFINE_MKX_UINTEGER_DEF(KaxTagDefault, 0x4484, 2, KaxTagSimple, "TagDefault",
1)
+DEFINE_MKX_UNISTRING(KaxTagString, 0x4487, 2, KaxTagSimple, "TagString")
+DEFINE_MKX_BINARY (KaxTagBinary, 0x4485, 2, KaxTagSimple, "TagBinary")

filepos_t KaxBlockVirtual::RenderData(IOCallback & /* output */, bool /*
bForceRender */, bool /* bSaveDefault */) {
assert(false); // no you are not allowed to use this element !
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmatroska-1.4.9/src/KaxVersion.cpp
new/libmatroska-1.5.0/src/KaxVersion.cpp
--- old/libmatroska-1.4.9/src/KaxVersion.cpp 2018-04-20 20:28:50.000000000
+0200
+++ new/libmatroska-1.5.0/src/KaxVersion.cpp 2019-03-12 20:54:34.000000000
+0100
@@ -37,7 +37,7 @@

START_LIBMATROSKA_NAMESPACE

-const std::string KaxCodeVersion = "1.4.9";
+const std::string KaxCodeVersion = "1.5.0";

// Up to version 1.4.4 this library exported a build date string. As
// this made the build non-reproducible, replace it by a placeholder to


< Previous Next >
This Thread
  • No further messages