vbystricky 4152135e63 Fix error with some opencl functions on the build WITH_OPENCL=OFF

2014-01-24 17:37:50 +04:00

..

doc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-23 18:50:17 +04:00

include/opencv2

Move OpticalFlowPyrLK from ocl module to video module

2014-01-24 17:37:50 +04:00

perf

Merge pull request #2110 from hmax:master

2014-01-23 14:37:34 +04:00

src

Fix error with some opencl functions on the build WITH_OPENCL=OFF

2014-01-24 17:37:50 +04:00

test

Merge pull request #2156 from ilya-lavrenov:tapi_reduce

2014-01-22 10:12:08 +04:00

CMakeLists.txt

Merge commit 'ee36717d' into merge-2.4

2013-12-30 16:49:39 +04:00