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

initialized members using initialize list of EBMLHeader

Browse Source 
Change-Id: I5bb46132141d7381dd23e0a3b87a3b6c0e8b7f4b
This commit is contained in:
Hwasoo Lee 2011-01-06 16:35:41 -05:00
parent 3b0f1b6d2b
commit b81751642e
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mkvparser.cpp
View File

@ -592,9 +592,10 @@ bool mkvparser::Match(
namespace mkvparser namespace mkvparser
{ {
EBMLHeader::EBMLHeader(): EBMLHeader::EBMLHeader() :
m_docType(NULL) m_docType(NULL)
{ {
Init();
} }
EBMLHeader::~EBMLHeader() EBMLHeader::~EBMLHeader()
@ -602,6 +603,23 @@ EBMLHeader::~EBMLHeader()
delete[] m_docType; delete[] m_docType;
} }
void EBMLHeader::Init()
{
m_version = 1;
m_readVersion = 1;
m_maxIdLength = 4;
m_maxSizeLength = 8;
if (m_docType)
{
delete[] m_docType;
m_docType = NULL;
}
m_docTypeVersion = 1;
m_docTypeReadVersion = 1;
}
long long EBMLHeader::Parse( long long EBMLHeader::Parse(
IMkvReader* pReader, IMkvReader* pReader,
long long& pos) long long& pos)
@ -700,13 +718,8 @@ long long EBMLHeader::Parse(
return pos + result; return pos + result;
end = pos + result; end = pos + result;
m_version = 1; Init();
m_readVersion = 1;
m_maxIdLength = 4;
m_maxSizeLength = 8;
m_docTypeVersion = 1;
m_docTypeReadVersion = 1;
while (pos < end) while (pos < end)
{ {

1
mkvparser.hpp
View File

@ -56,6 +56,7 @@ struct EBMLHeader
long long m_docTypeReadVersion; long long m_docTypeReadVersion;
long long Parse(IMkvReader*, long long&); long long Parse(IMkvReader*, long long&);
void Init();
}; };