diff options
| author | Mike Tzou <Chocobo1@users.noreply.github.com> | 2017-07-17 20:00:44 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-07-17 20:00:44 +0300 |
| commit | 3dd695efc94494c6622c54b266d839c0a284318b (patch) | |
| tree | 25bb9000d0e923392aba8e5177c4525356ed0442 | |
| parent | 1fb5005d17383afcdad9add3679eafb474886322 (diff) | |
Fix cppcheck warnings (#144)
* Fix initialize order
* Fix parameters order in declaration & definition aren't the same
| -rw-r--r-- | decoder/LAVVideo/decoders/wmv9.cpp | 2 | ||||
| -rw-r--r-- | demuxer/Demuxers/LAVFDemuxer.h | 4 | ||||
| -rw-r--r-- | demuxer/LAVSplitter/OutputPin.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/decoder/LAVVideo/decoders/wmv9.cpp b/decoder/LAVVideo/decoders/wmv9.cpp index 6fd9a6c7..e4dba4b5 100644 --- a/decoder/LAVVideo/decoders/wmv9.cpp +++ b/decoder/LAVVideo/decoders/wmv9.cpp @@ -44,7 +44,7 @@ ILAVDecoder *CreateDecoderWMV9() { class CMediaBuffer : public IMediaBuffer, public INSSBuffer3 { public: - CMediaBuffer(BYTE *pData, DWORD dwLength, bool bNSSBuffer) : m_pData(pData), m_dwLength(dwLength), m_dwMaxLength(dwLength), m_cRef(1), m_bNSSBuffer(bNSSBuffer), m_ContentType(0) {} + CMediaBuffer(BYTE *pData, DWORD dwLength, bool bNSSBuffer) : m_cRef(1), m_bNSSBuffer(bNSSBuffer), m_pData(pData), m_dwLength(dwLength), m_dwMaxLength(dwLength), m_ContentType(0) {} virtual ~CMediaBuffer() {} // IUnknown diff --git a/demuxer/Demuxers/LAVFDemuxer.h b/demuxer/Demuxers/LAVFDemuxer.h index 82fa0860..592dd639 100644 --- a/demuxer/Demuxers/LAVFDemuxer.h +++ b/demuxer/Demuxers/LAVFDemuxer.h @@ -153,8 +153,8 @@ private: void CleanupAVFormat(); void UpdateParserFlags(AVStream *st); - REFERENCE_TIME ConvertTimestampToRT(int64_t pts, int den, int num, int64_t starttime = (int64_t)AV_NOPTS_VALUE) const; - int64_t ConvertRTToTimestamp(REFERENCE_TIME timestamp, int den, int num, int64_t starttime = (int64_t)AV_NOPTS_VALUE) const; + REFERENCE_TIME ConvertTimestampToRT(int64_t pts, int num, int den, int64_t starttime = (int64_t)AV_NOPTS_VALUE) const; + int64_t ConvertRTToTimestamp(REFERENCE_TIME timestamp, int num, int den, int64_t starttime = (int64_t)AV_NOPTS_VALUE) const; int GetStreamIdxFromTotalIdx(size_t index) const; const CBaseDemuxer::stream* GetStreamFromTotalIdx(size_t index) const; diff --git a/demuxer/LAVSplitter/OutputPin.cpp b/demuxer/LAVSplitter/OutputPin.cpp index 66f0aa25..346f233d 100644 --- a/demuxer/LAVSplitter/OutputPin.cpp +++ b/demuxer/LAVSplitter/OutputPin.cpp @@ -30,10 +30,10 @@ CLAVOutputPin::CLAVOutputPin(std::deque<CMediaType>& mts, LPCWSTR pName, CBaseFilter *pFilter, CCritSec *pLock, HRESULT *phr, CBaseDemuxer::StreamType pinType, const char* container) : CBaseOutputPin(NAME("lavf dshow output pin"), pFilter, pLock, phr, pName) + , m_mts(mts) , m_containerFormat(container) , m_pinType(pinType) , m_Parser(this, container) - , m_mts(mts) { SetQueueSizes(); } |