projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c34445a
)
videoio(dshow) fix incompatible media type left set on video device
author
Kai Stüdemann
<kstuedemann@yahoo.de>
Thu, 3 Jun 2021 20:11:24 +0000
(22:11 +0200)
committer
Kai Stüdemann
<kstuedemann@yahoo.de>
Fri, 4 Jun 2021 08:45:39 +0000
(10:45 +0200)
modules/videoio/src/cap_dshow.cpp
patch
|
blob
|
history
diff --git
a/modules/videoio/src/cap_dshow.cpp
b/modules/videoio/src/cap_dshow.cpp
index
cf653f6
..
d80e13a
100644
(file)
--- a/
modules/videoio/src/cap_dshow.cpp
+++ b/
modules/videoio/src/cap_dshow.cpp
@@
-2609,7
+2609,8
@@
static bool setSizeAndSubtype(videoDevice * VD, int attemptWidth, int attemptHei
return true;
}else{
VD->streamConf->SetFormat(tmpType);
- if( tmpType != NULL )MyDeleteMediaType(tmpType);
+ if( VD->pAmMediaType != NULL)MyDeleteMediaType(VD->pAmMediaType);
+ VD->pAmMediaType = tmpType;
}
return false;