diff options
author | Underground78 <underground78@users.sourceforge.net> | 2015-11-14 18:12:12 +0300 |
---|---|---|
committer | Underground78 <underground78@users.sourceforge.net> | 2015-11-14 18:12:12 +0300 |
commit | d911f14d5619d800819d6f4658e72236720b79af (patch) | |
tree | 62e98291589b13a60672bfa9f355df28442534df /src/filters/switcher/AudioSwitcher | |
parent | 846eff07c13899dd7d3bf38251886b5263d41213 (diff) | |
parent | f5d92cef4639bbe461bfc923ce2294df969a6d69 (diff) |
Merge branch 'release-1.7.10'1.7.10
Diffstat (limited to 'src/filters/switcher/AudioSwitcher')
-rw-r--r-- | src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp | 4 | ||||
-rw-r--r-- | src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp index 8df7df63a..8e6dd1c27 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2014 see Authors.txt
+ * (C) 2006-2015 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -504,7 +504,7 @@ CMediaType CAudioSwitcherFilter::CreateNewOutputMediaType(CMediaType mt, long& c DWORD mask = DWORD((__int64(1) << wfe->nChannels) - 1);
for (int i = 0; i < AS_MAX_CHANNELS; i++) {
if (m_pSpeakerToChannelMap[wfe->nChannels - 1][i]&mask) {
- ChMap cm = {1 << i, m_pSpeakerToChannelMap[wfe->nChannels - 1][i]};
+ ChMap cm = {1u << i, m_pSpeakerToChannelMap[wfe->nChannels - 1][i]};
m_chs[wfe->nChannels - 1].Add(cm);
}
}
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index 03dc69479..a267f45c2 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2014 see Authors.txt
+ * (C) 2006-2015 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -1301,12 +1301,12 @@ HRESULT CStreamSwitcherFilter::CompleteConnect(PIN_DIRECTION dir, CBasePin* pPin name.Format(L"Channel %ld", ++m_PinVersion);
HRESULT hr = S_OK;
- CStreamSwitcherInputPin* pPin = DEBUG_NEW CStreamSwitcherInputPin(this, &hr, name);
- if (!pPin || FAILED(hr)) {
- delete pPin;
+ CStreamSwitcherInputPin* pInputPin = DEBUG_NEW CStreamSwitcherInputPin(this, &hr, name);
+ if (!pInputPin || FAILED(hr)) {
+ delete pInputPin;
return E_FAIL;
}
- m_pInputs.AddTail(pPin);
+ m_pInputs.AddTail(pInputPin);
}
}
|