Sync with specs: remove TrackTimecodeDenominator; add ChapterStringUID

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@869 a6f86f6d-0131-4f8e-9e7b-e335508773d5

diff --git a/ChangeLog b/ChangeLog
index 42cfee003664aa2fbdc46ed7a495f1abdfb5203c..b506961bee3b2cbec49dc14101e695fe6ff1a0d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-02 mosu
+    - Remove element TimecodeScaleDenominator again
+    - Add new element KaxChapterStringUID
+
 2012-09-23 mosu
 New 1.4.0 version:
     - Add new elements CueDuration, CueRelativePosition, TimecodeScaleDenominator
@@ -1988,4 +1992,3 @@ New 0.9.0 version:
          trunk/libmatroska/test/utf8,
          trunk/libmatroska/test/utf8/test5.cpp: Initial CVS version after
          the crash
-

diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index 4f64dd4cbac8283649a8b39275cc1fe5ceba17b4..481ca66a2f986e18a9cac293db1f95bac778af76 100644 (file)
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -98,11 +98,6 @@ DECLARE_MKX_BINARY (KaxChapterTranslateID)
 DECLARE_MKX_UINTEGER(KaxTimecodeScale)
 };
 
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxTimecodeScaleDenominator)
-};
-#endif
-
 DECLARE_MKX_FLOAT(KaxDuration)
 };
 

diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
index f7de1f6fc0d9a0f0ea0a6fa3104e8b319ecec509..d2df5172ab72c7f1c537cfcf15ab4df4958fe8f7 100644 (file)
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -79,9 +79,6 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxNextFilename)
 DEFINE_SEMANTIC_ITEM(false, false, KaxSegmentFamily)\r
 DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslate)\r
 DEFINE_SEMANTIC_ITEM(true, true, KaxTimecodeScale)\r
-#if MATROSKA_VERSION >= 2\r
-DEFINE_SEMANTIC_ITEM(true, true, KaxTimecodeScaleDenominator)\r
-#endif // MATROSKA_VERSION\r
 DEFINE_SEMANTIC_ITEM(false, true, KaxDuration)\r
 DEFINE_SEMANTIC_ITEM(false, true, KaxDateUTC)\r
 DEFINE_SEMANTIC_ITEM(false, true, KaxTitle)\r
@@ -109,9 +106,6 @@ DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2, KaxChapterTranslat
 DEFINE_MKX_UINTEGER(KaxChapterTranslateCodec, 0x69BF, 2, KaxChapterTranslate, "ChapterTranslateCodec");\r
 DEFINE_MKX_BINARY (KaxChapterTranslateID, 0x69A5, 2, KaxChapterTranslate, "ChapterTranslateID");\r
 DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScale, 0x2AD7B1, 3, KaxInfo, "TimecodeScale", 1000000);\r
-#if MATROSKA_VERSION >= 2\r
-DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScaleDenominator, 0x2AD7B2, 3, KaxInfo, "TimecodeScaleDenominator", 1000000000);\r
-#endif\r
 DEFINE_MKX_FLOAT(KaxDuration, 0x4489, 2, KaxInfo, "Duration");\r
 DEFINE_MKX_DATE    (KaxDateUTC, 0x4461, 2, KaxInfo, "DateUTC");\r
 DEFINE_MKX_UNISTRING(KaxTitle, 0x7BA9, 2, KaxInfo, "Title");\r