diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp | 7 | ||||
| -rw-r--r-- | src/mpc-hc/PPageFormats.cpp | 10 |
2 files changed, 8 insertions, 9 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),
diff --git a/src/mpc-hc/PPageFormats.cpp b/src/mpc-hc/PPageFormats.cpp index 8d3646123..1529a240b 100644 --- a/src/mpc-hc/PPageFormats.cpp +++ b/src/mpc-hc/PPageFormats.cpp @@ -517,12 +517,12 @@ void CPPageFormats::OnUpdateButtonSet(CCmdUI* pCmdUI) if (iItem < 0) {
pCmdUI->Enable(FALSE);
} else {
- DWORD_PTR i = m_list.GetItemData(iItem);
+ DWORD_PTR i = m_list.GetItemData(iItem);
- CString orgexts, newexts;
- GetDlgItem(IDC_EDIT1)->GetWindowText(newexts);
- newexts.Trim();
- orgexts = m_mf[i].GetExtsWithPeriod();
+ CString orgexts, newexts;
+ GetDlgItem(IDC_EDIT1)->GetWindowText(newexts);
+ newexts.Trim();
+ orgexts = m_mf[i].GetExtsWithPeriod();
pCmdUI->Enable(!!newexts.CompareNoCase(orgexts));
}
|