opencv/modules
Roman Donchenko 13cd0a0502 Merge remote-tracking branch 'origin/2.4'
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
..
androidcamera Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
calib3d Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
contrib Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
core Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
features2d Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
flann Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
gpu link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled 2013-06-13 16:46:34 +04:00
gpuarithm updated documentation 2013-06-11 17:58:05 +04:00
gpubgsegm renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
gpucodec refactored VideoReader (convert it to abstract interface) 2013-06-11 17:57:40 +04:00
gpufeatures2d renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
gpufilters updated documentation 2013-06-11 17:58:05 +04:00
gpuimgproc refactored gpu::convolve function: 2013-06-11 17:58:05 +04:00
gpulegacy renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
gpuoptflow renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
gpustereo renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
gpuwarping renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
highgui Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
java Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
legacy Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
ml Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
nonfree Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
objdetect Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods 2013-06-14 04:25:17 +04:00
ocl Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
photo renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
python Updated usage of METH_X definitions for python 3. 2013-06-13 20:10:01 -04:00
softcascade added missing <iostream> header 2013-06-10 17:47:55 +04:00
stitching Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
superres refactored VideoReader (convert it to abstract interface) 2013-06-11 17:57:40 +04:00
ts refactored gpu info structures (TargetArchs and DeviceInfo) 2013-06-10 12:40:32 +04:00
video Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
videostab Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
world Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
refman.rst.in Made reference manual table of contents autogenerated 2012-05-30 14:06:47 +00:00