Merge pull request #2373 from mlyashko:optflow_dualtvl1

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Tue, 11 Mar 2014 12:00:21 +0000 (16:00 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 11 Mar 2014 12:00:22 +0000 (16:00 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 11 Mar 2014 12:00:21 +0000 (16:00 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Mar 2014 12:00:22 +0000 (16:00 +0400)
diff --cc modules/core/src/ocl.cpp
Simple merge
diff --cc modules/video/src/lkpyramid.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Tue, 11 Mar 2014 12:00:21 +0000 (16:00 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 11 Mar 2014 12:00:22 +0000 (16:00 +0400)
		1	2
modules/core/src/ocl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/video/src/lkpyramid.cpp	patch \|	diff1 \|	diff2 \|	blob \| history