Merge pull request #6849 from alcinos:optflow_interface
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)
commitd62b0bd3639dccc72afb56faab1178678733c228
tree7d73a039ac646329edb449c67750c414bed74c83
parent4da91f9e6decee416f580402f55d943db1bf74a9
parente22b838af8a0078ca472583d76d0244dc9fad455
Merge pull request #6849 from alcinos:optflow_interface
modules/core/include/opencv2/core/ptr.inl.hpp
modules/video/include/opencv2/video/tracking.hpp