projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c2ef36
854a722
)
Merge pull request #3504 from a-wi:VideoCapture_get_const_v3
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Fri, 26 Dec 2014 14:37:47 +0000
(14:37 +0000)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Fri, 26 Dec 2014 14:37:47 +0000
(14:37 +0000)
1
2
modules/videoio/include/opencv2/videoio.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/videoio/src/cap_libv4l.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/videoio/src/cap_openni2.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/videoio/include/opencv2/videoio.hpp
Simple merge
diff --cc
modules/videoio/src/cap_libv4l.cpp
Simple merge
diff --cc
modules/videoio/src/cap_openni2.cpp
Simple merge