1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge branch 'cuda_concurrency' into tvl1_chambolle

This commit is contained in:
Ernest Galbrun
2014-07-31 16:08:57 +02:00
437 changed files with 10444 additions and 13214 deletions
@@ -381,7 +381,6 @@ INSTANTIATE_TEST_CASE_P(CUDA_OptFlow, OpticalFlowDual_TVL1, testing::Combine(
ALL_DEVICES,
WHOLE_SUBMAT));
//////////////////////////////////////////////////////
// FastOpticalFlowBM