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
49321a23
Commit
49321a23
authored
May 31, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11632 from alalek:videoio_fixes
parents
1b27351f
ddba7722
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
cap.cpp
modules/videoio/src/cap.cpp
+1
-1
videoio_registry.cpp
modules/videoio/src/videoio_registry.cpp
+1
-1
No files found.
modules/videoio/src/cap.cpp
View file @
49321a23
...
...
@@ -169,7 +169,7 @@ bool VideoCapture::isOpened() const
{
if
(
!
icap
.
empty
())
return
icap
->
isOpened
();
return
!
i
cap
.
empty
();
// legacy interface doesn't support closed files
return
!
cap
.
empty
();
// legacy interface doesn't support closed files
}
void
VideoCapture
::
release
()
...
...
modules/videoio/src/videoio_registry.cpp
View file @
49321a23
...
...
@@ -288,7 +288,7 @@ namespace videoio_registry {
std
::
vector
<
VideoBackendInfo
>
getAvailableBackends_CaptureByIndex
()
{
const
std
::
vector
<
VideoBackendInfo
>
result
=
VideoBackendRegistry
::
getInstance
().
getAvailableBackends_CaptureBy
Filename
();
const
std
::
vector
<
VideoBackendInfo
>
result
=
VideoBackendRegistry
::
getInstance
().
getAvailableBackends_CaptureBy
Index
();
return
result
;
}
std
::
vector
<
VideoBackendInfo
>
getAvailableBackends_CaptureByFilename
()
...
...
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