Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnderground78 <underground78@users.sourceforge.net>2015-07-29 19:52:04 +0300
committerUnderground78 <underground78@users.sourceforge.net>2015-08-02 19:48:38 +0300
commit2958ccba4aa639efb40e4c6aaa614a224dc4ae12 (patch)
treeb2b35adb9920986be5fe23dbc0781efc97f75d5c /src/filters/parser
parentf5758c6b575392ff5be92a2517ed5c46c770547f (diff)
Fix some "declaration hides previous declaration" warnings.
Mostly C4456 and C4457 warnings with a few C4458 warnings.
Diffstat (limited to 'src/filters/parser')
-rw-r--r--src/filters/parser/BaseSplitter/BaseSplitter.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
index a16b45bd4..2e29e37c1 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitter.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.
*
@@ -1095,9 +1095,9 @@ bool CBaseSplitterFilter::IsAnyPinDrying()
// if (m_priority != THREAD_PRIORITY_ABOVE_NORMAL && (count < MINPACKETS/3 || size < MINPACKETSIZE/3))
if (m_priority != THREAD_PRIORITY_BELOW_NORMAL && (count < MINPACKETS / 3 || size < MINPACKETSIZE / 3)) {
// SetThreadPriority(m_hThread, m_priority = THREAD_PRIORITY_ABOVE_NORMAL);
- POSITION pos = m_pOutputs.GetHeadPosition();
- while (pos) {
- m_pOutputs.GetNext(pos)->SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
+ POSITION pos2 = m_pOutputs.GetHeadPosition();
+ while (pos2) {
+ m_pOutputs.GetNext(pos2)->SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
}
m_priority = THREAD_PRIORITY_BELOW_NORMAL;
}
@@ -1109,9 +1109,9 @@ bool CBaseSplitterFilter::IsAnyPinDrying()
if (m_priority != THREAD_PRIORITY_NORMAL && (totalcount > m_QueueMaxPackets * 2 / 3 || totalsize > MAXPACKETSIZE * 2 / 3)) {
// SetThreadPriority(m_hThread, m_priority = THREAD_PRIORITY_NORMAL);
- POSITION pos = m_pOutputs.GetHeadPosition();
- while (pos) {
- m_pOutputs.GetNext(pos)->SetThreadPriority(THREAD_PRIORITY_NORMAL);
+ POSITION pos2 = m_pOutputs.GetHeadPosition();
+ while (pos2) {
+ m_pOutputs.GetNext(pos2)->SetThreadPriority(THREAD_PRIORITY_NORMAL);
}
m_priority = THREAD_PRIORITY_NORMAL;
}