Roman Donchenko 9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... 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		2013-11-05 16:38:23 +04:00
..
performance
768x576.avi
aloeL.jpg
aloeR.jpg
alpha_comp.cpp
basketball1.png
basketball2.png
bgfg_segm.cpp
brox_optical_flow.cpp
cascadeclassifier_nvidia_api.cpp
cascadeclassifier.cpp
CMakeLists.txt
driver_api_multi.cpp
driver_api_stereo_multi.cpp
farneback_optical_flow.cpp
generalized_hough.cpp
hog.cpp
houghlines.cpp
morphology.cpp
multi.cpp
opengl.cpp
optical_flow.cpp
opticalflow_nvidia_api.cpp
pyrlk_optical_flow.cpp
road.png
rubberwhale1.png
rubberwhale2.png
softcascade.cpp
stereo_match.cpp
stereo_multi.cpp
super_resolution.cpp
surf_keypoint_matcher.cpp
tsucuba_left.png
tsucuba_right.png
video_reader.cpp
video_writer.cpp