diff options
| author | XhmikosR <xhmikosr@gmail.com> | 2014-10-10 13:53:06 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2014-10-20 09:04:48 +0400 |
| commit | 2a0054b97cfa1e434e83016b6c1d5a2fb555956f (patch) | |
| tree | 859a3287533516c4ddde6e072653f928721adac7 /src/filters/parser/BaseSplitter | |
| parent | 4d265207e31cafb97a7c3953cf83db5f669cf9f2 (diff) | |
Initializer list order fixes.
Found with cppcheck (inconclusive enabled).
Diffstat (limited to 'src/filters/parser/BaseSplitter')
| -rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitter.cpp | 15 | ||||
| -rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitter.h | 8 | ||||
| -rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitterFile.cpp | 8 | ||||
| -rw-r--r-- | src/filters/parser/BaseSplitter/MultiFiles.cpp | 8 |
4 files changed, 21 insertions, 18 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 9a09a375c..a16b45bd4 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -773,17 +773,20 @@ STDMETHODIMP CBaseSplitterOutputPin::GetPreroll(LONGLONG* pllPreroll) CBaseSplitterFilter::CBaseSplitterFilter(LPCTSTR pName, LPUNKNOWN pUnk, HRESULT* phr, const CLSID& clsid, int QueueMaxPackets)
: CBaseFilter(pName, pUnk, this, clsid)
- , m_rtDuration(0), m_rtStart(0), m_rtStop(0), m_rtCurrent(0)
- , m_dRate(1.0)
, m_nOpenProgress(100)
, m_fAbort(false)
- , m_rtLastStart(_I64_MIN)
- , m_rtLastStop(_I64_MIN)
- , m_priority(THREAD_PRIORITY_NORMAL)
- , m_QueueMaxPackets(QueueMaxPackets)
+ , m_rtDuration(0)
+ , m_rtStart(0)
+ , m_rtStop(0)
+ , m_rtCurrent(0)
, m_rtNewStart(0)
, m_rtNewStop(0)
+ , m_dRate(1.0)
, m_fFlushing(false)
+ , m_priority(THREAD_PRIORITY_NORMAL)
+ , m_QueueMaxPackets(QueueMaxPackets)
+ , m_rtLastStart(_I64_MIN)
+ , m_rtLastStop(_I64_MIN)
{
if (phr) {
*phr = S_OK;
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.h b/src/filters/parser/BaseSplitter/BaseSplitter.h index 55eaba8da..005737029 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.h +++ b/src/filters/parser/BaseSplitter/BaseSplitter.h @@ -45,13 +45,13 @@ public: REFERENCE_TIME rtStart, rtStop;
AM_MEDIA_TYPE* pmt;
Packet()
- : pmt(nullptr)
+ : TrackNumber(0)
, bDiscontinuity(FALSE)
- , bAppendable(FALSE)
, bSyncPoint(FALSE)
- , TrackNumber(0)
+ , bAppendable(FALSE)
, rtStart(0)
- , rtStop(0) {
+ , rtStop(0)
+ , pmt(nullptr) {
}
virtual ~Packet() {
if (pmt) {
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp index 8536e4d8c..f549c0aa6 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2013 see Authors.txt
+ * (C) 2006-2014 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -29,15 +29,15 @@ CBaseSplitterFile::CBaseSplitterFile(IAsyncReader* pAsyncReader, HRESULT& hr, int cachelen, bool fRandomAccess, bool fStreaming)
: m_pAsyncReader(pAsyncReader)
+ , m_cachepos(0)
+ , m_cachelen(0)
+ , m_cachetotal(0)
, m_fStreaming(false)
, m_fRandomAccess(false)
, m_pos(0)
, m_len(0)
, m_bitbuff(0)
, m_bitlen(0)
- , m_cachepos(0)
- , m_cachelen(0)
- , m_cachetotal(0)
{
if (!m_pAsyncReader) {
hr = E_UNEXPECTED;
diff --git a/src/filters/parser/BaseSplitter/MultiFiles.cpp b/src/filters/parser/BaseSplitter/MultiFiles.cpp index 1e263c150..d422f85ff 100644 --- a/src/filters/parser/BaseSplitter/MultiFiles.cpp +++ b/src/filters/parser/BaseSplitter/MultiFiles.cpp @@ -1,5 +1,5 @@ /*
- * (C) 2009-2013 see Authors.txt
+ * (C) 2009-2014 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -26,10 +26,10 @@ IMPLEMENT_DYNAMIC(CMultiFiles, CObject)
CMultiFiles::CMultiFiles()
- : m_hFile(INVALID_HANDLE_VALUE)
- , m_llTotalLength(0)
+ : m_pCurrentPTSOffset(nullptr)
+ , m_hFile(INVALID_HANDLE_VALUE)
, m_nCurPart(-1)
- , m_pCurrentPTSOffset(nullptr)
+ , m_llTotalLength(0)
{
}
|