Merge pull request #6849 from alcinos:optflow_interface

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)

committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)
committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)
diff --cc modules/core/include/opencv2/core/ptr.inl.hpp
Simple merge
diff --cc modules/video/include/opencv2/video/tracking.hpp
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)
committer	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)
		1	2
modules/core/include/opencv2/core/ptr.inl.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/video/include/opencv2/video/tracking.hpp	patch \|	diff1 \|	diff2 \|	blob \| history