generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "mkvparser::BlockEntry: inline EOS()"

Browse Source
This commit is contained in:
James Zern 2016-03-30 00:30:11 +00:00 committed by Gerrit Code Review
commit 6ef8264fcc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkvparser/mkvparser.cc
View File

@ -7447,7 +7447,6 @@ const BlockEntry* Cluster::GetEntry(const CuePoint& cp,
BlockEntry::BlockEntry(Cluster* p, long idx) : m_pCluster(p), m_index(idx) {}
BlockEntry::~BlockEntry() {}
bool BlockEntry::EOS() const { return (GetKind() == kBlockEOS); }
const Cluster* BlockEntry::GetCluster() const { return m_pCluster; }
long BlockEntry::GetIndex() const { return m_index; }
@ -7936,4 +7935,4 @@ long Block::Frame::Read(IMkvReader* pReader, unsigned char* buf) const {
long long Block::GetDiscardPadding() const { return m_discard_padding; }
} // namespace mkvparser
} // namespace mkvparser

2
mkvparser/mkvparser.h
View File

@ -126,7 +126,7 @@ class BlockEntry {
public:
virtual ~BlockEntry();
bool EOS() const;
bool EOS() const { return (GetKind() == kBlockEOS); }
const Cluster* GetCluster() const;
long GetIndex() const;
virtual const Block* GetBlock() const = 0;