diff options
| author | 2016-07-31 11:50:20 +0200 | |
|---|---|---|
| committer | 2016-07-31 14:41:02 +0200 | |
| commit | 9667c6a8cce1829a7321dde67bd0287c73234386 (patch) | |
| tree | f3665957d557cb18728a40e75f7d9f2341aaff1d /src/tools/ldresample.cpp | |
| parent | 69ac4affc86caac51ff9720083ed128dabdb932f (diff) | |
std::min and std:max instead of MIN and MAX, also some more macros converted to inline functions (nw)
Diffstat (limited to 'src/tools/ldresample.cpp')
| -rw-r--r-- | src/tools/ldresample.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/ldresample.cpp b/src/tools/ldresample.cpp index 1f04edac3f0..9cc4f264a44 100644 --- a/src/tools/ldresample.cpp +++ b/src/tools/ldresample.cpp @@ -475,7 +475,7 @@ printf("%5d: start=%10d (%5d.%03d) end=%10d (%5d.%03d)\n", dynamic_buffer buffer; INT16 *sampledata[2] = { &m_info.lsound[0], &m_info.rsound[0] }; avhuff_encoder::assemble_data(buffer, m_info.bitmap, m_info.channels, m_info.samples, sampledata); - memcpy(dest, &buffer[0], MIN(buffer.size(), datasize)); + memcpy(dest, &buffer[0], std::min(buffer.size(), size_t(datasize))); if (buffer.size() < datasize) memset(&dest[buffer.size()], 0, datasize - buffer.size()); } |
