opencv/modules/cudaoptflow/src
Vladislav Vinogradov 1ad4592bfc Merge branch 'master' into gpu-cuda-rename
Conflicts:
	modules/cudaoptflow/perf/perf_optflow.cpp
	modules/cudaoptflow/src/tvl1flow.cpp
	samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
..
cuda Merge branch 'master' into gpu-cuda-rename 2013-09-04 09:58:32 +04:00
bm_fast.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
bm.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
brox.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
farneback.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
interpolate_frames.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
needle_map.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
precomp.hpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
pyrlk.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
tvl1flow.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-04 09:58:32 +04:00