diff --git a/ChangeLog b/ChangeLog index 42cfee0..b506961 100644 --- 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 4f64dd4..481ca66 100644 --- 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 f7de1f6..d2df517 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -79,9 +79,6 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxNextFilename) DEFINE_SEMANTIC_ITEM(false, false, KaxSegmentFamily) DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslate) DEFINE_SEMANTIC_ITEM(true, true, KaxTimecodeScale) -#if MATROSKA_VERSION >= 2 -DEFINE_SEMANTIC_ITEM(true, true, KaxTimecodeScaleDenominator) -#endif // MATROSKA_VERSION DEFINE_SEMANTIC_ITEM(false, true, KaxDuration) DEFINE_SEMANTIC_ITEM(false, true, KaxDateUTC) DEFINE_SEMANTIC_ITEM(false, true, KaxTitle) @@ -109,9 +106,6 @@ DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2, KaxChapterTranslat 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); -#if MATROSKA_VERSION >= 2 -DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScaleDenominator, 0x2AD7B2, 3, KaxInfo, "TimecodeScaleDenominator", 1000000000); -#endif DEFINE_MKX_FLOAT(KaxDuration, 0x4489, 2, KaxInfo, "Duration"); DEFINE_MKX_DATE (KaxDateUTC, 0x4461, 2, KaxInfo, "DateUTC"); DEFINE_MKX_UNISTRING(KaxTitle, 0x7BA9, 2, KaxInfo, "Title");