Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 22 Aug 2018 14:38:51 +0000 (17:38 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 22 Aug 2018 14:38:51 +0000 (17:38 +0300)
commit63564039640c81256ccfedf77899e37746352d45
tree7b84faa7b3103efff6160887a85dd6b7b254e666
parente8a14a775ea142f92cf09ecade3337c7ff2b2ca7
parent6700fdb81f7bdf8be918b8ced397f9eefb612dad
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cvdef.h
modules/videoio/src/cap_v4l.cpp