diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2015-07-27 00:05:17 +0300 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2015-08-01 17:50:18 +0300 |
| commit | ffffb3ed51c96a66693f8d46164bb26291b3389b (patch) | |
| tree | c1bdedfc9cfa9e645c058dac46d551a18a49e816 | |
| parent | 69db692d966bc8123b8061be03899da25fd872fb (diff) | |
Silence some C4838 warnings.
| -rw-r--r-- | src/Subtitles/VobSubFile.cpp | 4 | ||||
| -rw-r--r-- | src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp index 5aea79665..6567cb137 100644 --- a/src/Subtitles/VobSubFile.cpp +++ b/src/Subtitles/VobSubFile.cpp @@ -1942,7 +1942,7 @@ bool CVobSubFile::SaveScenarist(CString fn, int delay) BITMAPINFOHEADER ihdr = {
sizeof(BITMAPINFOHEADER),
720, m_size.cy - 2, 1, 4, 0,
- 360 * (m_size.cy - 2),
+ DWORD(360 * (m_size.cy - 2)),
0, 0,
16, 4
};
@@ -2178,7 +2178,7 @@ bool CVobSubFile::SaveMaestro(CString fn, int delay) BITMAPINFOHEADER ihdr = {
sizeof(BITMAPINFOHEADER),
720, m_size.cy - 2, 1, 4, 0,
- 360 * (m_size.cy - 2),
+ DWORD(360 * (m_size.cy - 2)),
0, 0,
16, 4
};
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);
}
}
|