diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-11-26 11:34:37 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2014-01-05 21:56:22 +0400 |
| commit | 93b8cae4366fc902ace28dfa71e209214b17001f (patch) | |
| tree | b6f9d8c4ff36f8a09b0940b65fc50a4a08471948 /src/filters/parser | |
| parent | 542281062b6addea99afd6028f506759ff7c5d52 (diff) | |
Use min/max templated functions from std (part 1).
Diffstat (limited to 'src/filters/parser')
| -rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitter.cpp | 1 | ||||
| -rw-r--r-- | src/filters/parser/StreamDriveThru/StreamDriveThru.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 111daf53e..202674941 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -25,6 +25,7 @@ #include "moreuuids.h"
#include "../../switcher/AudioSwitcher/AudioSwitcher.h"
#include "BaseSplitter.h"
+#include <algorithm>
//
diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp b/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp index 8756f3786..dce64a367 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp @@ -20,6 +20,7 @@ */
#include "stdafx.h"
+#include <algorithm>
#include "StreamDriveThru.h"
#include "../../../DSUtil/DSUtil.h"
@@ -163,7 +164,7 @@ DWORD CStreamDriveThruFilter::ThreadProc() break;
}
- LONG size = (LONG)min(PACKETSIZE, total - m_position);
+ LONG size = (LONG)std::min(PACKETSIZE, total - m_position);
if (FAILED(pAsyncReader->SyncRead(m_position, size, buff))) {
cmd = CMD_STOP;
break;
|