From: Moritz Bunkus <moritz@bunkus.org>
Date: Fri, 10 Mar 2017 13:33:34 +0000 (+0100)
Subject: Revert "forbid the use of KaxTimeSlice and KaxSliceLaceNumber as they are deprecated... 
X-Git-Tag: release-1.4.6~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87540755b4abc3548e9b484557df3e8f6bac9c49;p=libmatroska

Revert "forbid the use of KaxTimeSlice and KaxSliceLaceNumber as they are deprecated since v1"

This reverts commit 3c698a372abe63a60b60309f2bbeaf12d1c15979. It
isn't really required, but it breaks ABI compatibility.
---

diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index b383e6a..65084fb 100644
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -168,14 +168,10 @@ DECLARE_MKX_MASTER(KaxSlices)
 
 
 DECLARE_MKX_MASTER(KaxTimeSlice)
-public:
-  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 
 DECLARE_MKX_UINTEGER(KaxSliceLaceNumber)
-public:
-  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 #if MATROSKA_VERSION >= 2
diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
index 3242f43..4af2557 100644
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -803,16 +803,6 @@ filepos_t KaxReferenceVirtual::RenderData(IOCallback & /* output */, bool /* bFo
   return 0;
 }
 
-filepos_t KaxTimeSlice::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-  assert(false); // no you are not allowed to use this element !
-  return 0;
-}
-
-filepos_t KaxSliceLaceNumber::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-  assert(false); // no you are not allowed to use this element !
-  return 0;
-}
-
 filepos_t KaxSliceFrameNumber::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
   assert(false); // no you are not allowed to use this element !
   return 0;