diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-22 13:07:34 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-22 13:07:34 +0400 |
| commit | 8dfe68d70c394f84fc144385f4d4498d0c3f334d (patch) | |
| tree | e92025f2f6c85ee98c1b84c9e93852bf78496157 /src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp | |
| parent | ab1ae8ebde86d85cec608a5ef256348ab7e451ff (diff) | |
MatroskaMuxer.cpp: fix a C4267 warning
PPageFormats.cpp: tabs to spaces
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5231 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp')
| -rw-r--r-- | src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp index e66175dd3..7c1956587 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp @@ -143,7 +143,7 @@ void CMatroskaMuxerFilter::AddInput() int CMatroskaMuxerFilter::GetPinCount()
{
- return m_pInputs.GetCount() + (m_pOutput ? 1 : 0);
+ return (int)m_pInputs.GetCount() + (m_pOutput ? 1 : 0);
}
CBasePin* CMatroskaMuxerFilter::GetPin(int n)
@@ -1229,10 +1229,9 @@ STDMETHODIMP CMatroskaMuxerInputPin::Receive(IMediaSample* pSample) return VFW_E_SAMPLE_TIME_NOT_SET;
}
- // rtStart += m_tStart;
- // rtStop += m_tStart;
+ //rtStart += m_tStart;
+ //rtStop += m_tStart;
- /**/
TRACE(_T("Received (%d): %I64d-%I64d (c=%d, co=%dms), len=%d, d%d p%d s%d\n"),
(static_cast<CMatroskaMuxerFilter*>(m_pFilter))->GetTrackNumber(this),
rtStart, rtStop, (int)((rtStart / 10000) / MAXCLUSTERTIME), (int)((rtStart / 10000) % MAXCLUSTERTIME),
|