mirror of
https://github.com/opencv/opencv.git
synced 2024-12-26 10:48:12 +08:00
9c83f6c4fb
Conflicts: cmake/OpenCVDetectCUDA.cmake modules/core/include/opencv2/core/version.hpp modules/cudacodec/src/ffmpeg_video_source.cpp modules/gpu/src/video_writer.cpp modules/highgui/test/test_ffmpeg.cpp modules/highgui/test/test_video_io.cpp modules/highgui/test/test_video_pos.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/src/arithm.cpp modules/ocl/src/blend.cpp modules/ocl/src/canny.cpp modules/ocl/src/cl_operations.cpp modules/ocl/src/filtering.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/kmeans.cpp modules/ocl/src/moments.cpp modules/ocl/src/safe_call.hpp modules/ocl/src/split_merge.cpp modules/ocl/test/test_moments.cpp samples/ocl/squares.cpp |
||
---|---|---|
.. | ||
affineflow.cpp | ||
bgfg_gaussmix2.cpp | ||
bgfg_gaussmix.cpp | ||
bgfg_gmg.cpp | ||
camshift.cpp | ||
compat_video.cpp | ||
ecc.cpp | ||
kalman.cpp | ||
lkpyramid.cpp | ||
lkpyramid.hpp | ||
motempl.cpp | ||
optflowgf.cpp | ||
precomp.hpp | ||
simpleflow.cpp | ||
tvl1flow.cpp | ||
video_init.cpp |