diff options
Diffstat (limited to 'src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp')
| -rw-r--r-- | src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp index c9c2de091..1d2946f62 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2015 see Authors.txt
+ * (C) 2006-2016 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -359,6 +359,8 @@ ULONGLONG SetStreamPosition(IStream* pStream, ULONGLONG seekpos) return posnew.QuadPart;
}
+#pragma warning(push)
+#pragma warning(disable: 4702)
DWORD CMatroskaMuxerFilter::ThreadProc()
{
CComQIPtr<IStream> pStream;
@@ -573,7 +575,7 @@ DWORD CMatroskaMuxerFilter::ThreadProc() {
CAutoLock cAutoLock(&pPin->m_csQueue);
- b = pPin->m_blocks.RemoveHead();
+ b.Attach(pPin->m_blocks.RemoveHead().Detach());
}
if (b) {
@@ -704,11 +706,8 @@ DWORD CMatroskaMuxerFilter::ThreadProc() break;
}
}
-
- ASSERT(0); // we should only exit via CMD_EXIT
-
- CAMThread::m_hThread = nullptr;
- return 0;
+ UNREACHABLE_CODE(); // we should only exit via CMD_EXIT
+#pragma warning(pop)
}
//
|