diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp
index 5f9567103d..3611d0da80 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.cpp
+++ b/src/filters/parser/AviSplitter/AviSplitter.cpp
@@ -1,6 +1,6 @@
 /*
  * (C) 2003-2006 Gabest
- * (C) 2006-2023 see Authors.txt
+ * (C) 2006-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -609,7 +609,7 @@ HRESULT CAviSplitterFilter::ReIndex(__int64 end, UINT64& Size, DWORD TrackNumber
 		return E_FAIL;
 	}
 
-	while (S_OK == hr && m_pFile->GetPos() < end && SUCCEEDED(hr) && !m_fAbort) {
+	while (S_OK == hr && m_pFile->GetPos() < end && !m_fAbort) {
 		__int64 pos = m_pFile->GetPos();
 
 		DWORD id = 0, size;
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
index 79228b9ed9..5757366c70 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
@@ -1186,7 +1186,7 @@ HRESULT CMatroskaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 								}
 							}
 						}
-					} while (m_pBlock->NextBlock() && SUCCEEDED(hr) && !CheckRequest(nullptr) && !bIsParse);
+					} while (m_pBlock->NextBlock() && !CheckRequest(nullptr) && !bIsParse);
 
 					m_pBlock.reset();
 					m_pCluster.reset();
@@ -1275,7 +1275,7 @@ HRESULT CMatroskaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 							bIsParse = TRUE;
 							break;
 						}
-					} while (m_pBlock->NextBlock() && SUCCEEDED(hr) && !CheckRequest(nullptr) && !bIsParse);
+					} while (m_pBlock->NextBlock() && !CheckRequest(nullptr) && !bIsParse);
 
 					m_pBlock.reset();
 					m_pCluster.reset();
@@ -2568,10 +2568,10 @@ HRESULT CMatroskaSplitterFilter::DeliverMatroskaPacket(std::unique_ptr<CMatroska
 
 			const BYTE marker = pData[size - 1];
 			if ((marker & 0xe0) == 0xc0) {
-				const BYTE nbytes = 1 + ((marker >> 3) & 0x3);
+				const BYTE nbytes = 1 + ((marker >> 3) & 0x3); // nbytes only accepts values from 1 to 4
 				BYTE n_frames = 1 + (marker & 0x7);
 				const size_t idx_sz = 2 + n_frames * nbytes;
-				if (size >= idx_sz && pData[size - idx_sz] == marker && nbytes >= 1 && nbytes <= 4) {
+				if (size >= idx_sz && pData[size - idx_sz] == marker) {
 					const BYTE *idx = pData + size + 1 - idx_sz;
 
 					while (n_frames--) {