projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f0676f e489f29)
Merge pull request #6391 from virtuald:v4l-device-name
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 12 Apr 2016 12:57:21 +0000 (12:57 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 12 Apr 2016 12:57:21 +0000 (12:57 +0000)
1  2 
modules/videoio/src/cap_libv4l.cpp patch | diff1 | diff2 | blob | history
modules/videoio/src/cap_v4l.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/videoio/src/cap_libv4l.cpp
Simple merge
diff --cc modules/videoio/src/cap_v4l.cpp
Simple merge
Domain: Multimedia / Media Vision;