Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5a27f7c8
Commit
5a27f7c8
authored
6 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11856 from alalek:videoio_msmf_fix_check
parents
6ce26b72
c3a90ccb
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
cap_msmf.cpp
modules/videoio/src/cap_msmf.cpp
+1
-4
No files found.
modules/videoio/src/cap_msmf.cpp
View file @
5a27f7c8
...
...
@@ -1071,18 +1071,15 @@ HRESULT SourceReaderCB::Wait(DWORD dwMilliseconds, _ComPtr<IMFSample>& videoSamp
return
HRESULT_FROM_WIN32
(
GetLastError
());
}
if
(
!
bEOS
)
{
cv
::
AutoLock
lock
(
m_mutex
);
bEOS
=
m_bEOS
;
if
(
!
bEOS
)
{
cv
::
AutoLock
lock
(
m_mutex
);
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
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment