opencv/modules/videostab/src
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
..
clp.hpp Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
deblurring.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
fast_marching.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
frame_source.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
global_motion.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
inpainting.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
log.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
motion_stabilizing.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
optical_flow.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
outlier_rejection.cpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
precomp.hpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
stabilizer.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
wobble_suppression.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00