From: Alexander Alekhin <alexander.alekhin@intel.com>
Date: Fri, 29 Jun 2018 12:23:48 +0000 (+0300)
Subject: videoio(MSMF): remove "always true" check
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~608^2~2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3a90ccbad03c3de0d399d6f02d1cdf2081271c3;p=platform%2Fupstream%2Fopencv.git

videoio(MSMF): remove "always true" check
---

diff --git a/modules/videoio/src/cap_msmf.cpp b/modules/videoio/src/cap_msmf.cpp
index 8e1a60a..35026bc 100644
--- a/modules/videoio/src/cap_msmf.cpp
+++ b/modules/videoio/src/cap_msmf.cpp
@@ -1056,17 +1056,14 @@ HRESULT SourceReaderCB::Wait(DWORD dwMilliseconds, _ComPtr<IMFSample>& videoSamp
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
+    bEOS = m_bEOS;
     if (!bEOS)
     {
         cv::AutoLock lock(m_mutex);
-        bEOS = m_bEOS;
-        if (!bEOS)
-        {
-            videoSample = m_lastSample;
-            CV_Assert(videoSample);
-            m_lastSample.Release();
-            ResetEvent(m_hEvent);  // event is auto-reset, but we need this forced reset due time gap between wait() and mutex hold.
-        }
+        videoSample = m_lastSample;
+        CV_Assert(videoSample);
+        m_lastSample.Release();
+        ResetEvent(m_hEvent);  // event is auto-reset, but we need this forced reset due time gap between wait() and mutex hold.
     }
 
     return m_hrStatus;