From f5ec272e54e45feebac5926554d842a7cf72df53 Mon Sep 17 00:00:00 2001 From: matthewjheaney Date: Fri, 18 Mar 2011 11:18:46 -0400 Subject: [PATCH] libwebm: removed Cluster::Load (non-incremental) Change-Id: I1f2ad153e0c643d04fa1fe1ec85410bbef1954ef --- mkvparser.cpp | 12 ++++++++++++ mkvparser.hpp | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mkvparser.cpp b/mkvparser.cpp index 9f83c8f..96afcd1 100644 --- a/mkvparser.cpp +++ b/mkvparser.cpp @@ -5837,6 +5837,7 @@ long long Cluster::Unparsed() const #endif +#if 0 void Cluster::Load() const { assert(m_pSegment); @@ -5911,6 +5912,7 @@ void Cluster::Load() const m_timecode = timecode; } +#endif long Cluster::Load(long long& pos, long& len) const @@ -7305,7 +7307,17 @@ void Cluster::LoadBlockEntries() const long long Cluster::GetTimeCode() const { +#if 0 Load(); +#else + long long pos; + long len; + + const long status = Load(pos, len); + status; + assert(status == 0); +#endif + return m_timecode; } diff --git a/mkvparser.hpp b/mkvparser.hpp index f769972..0bb6e5c 100644 --- a/mkvparser.hpp +++ b/mkvparser.hpp @@ -581,7 +581,7 @@ public: long GetEntryCount() const; - void Load() const; + //void Load() const; long Load(long long& pos, long& size) const; void LoadBlockEntries() const;