mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1036ce807c
opencv/modules/video
History
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
..
doc Merge branch 'master' into merge-2.4 2013-08-16 14:14:12 +04:00
include/opencv2 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
src Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
test Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
CMakeLists.txt Global CMake reorganization: 2012-02-03 11:26:49 +00:00