Alexander Alekhin 67a734ce73 Merge branch '2.4' into master ... Commits: 67fe57a add fixed video db0ae2c Restore 2.4 source branch for bug fix 6317. 97ac59c Fix a memory leak indirectly caused by cvDestroyWindow eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer 421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability 912592d Remove "INSTALL_NAME_DIR lib" target property bb1c2d7 fix bug on border at pyrUp		2016-04-21 20:15:08 +03:00
..
checks	ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)	2016-02-11 12:44:45 +03:00
FindCUDA
templates	fix OpenCV_CONFIG_PATH get null value after CMake 2.8.11	2016-04-06 11:33:53 +08:00
cl2cpp.cmake	workaround: cvconfig.h doesn't work with hal at this moment	2015-12-14 13:52:02 +03:00
copyAndroidLibs.cmake
FindCUDA.cmake	Fix compilation problems with XCode 7.1.1 and cmake 3.3.2	2015-11-17 18:52:55 +03:00
FindGstreamerWindows.cmake	Gstreamer 1.0 on windows.	2015-12-09 09:11:45 -05:00
OpenCVCompilerOptions.cmake	Fixed cmake and build issues when using Visual Studio 2015	2015-10-29 11:50:48 +03:00
OpenCVConfig.cmake	fix OpenCV_CONFIG_PATH get null value after CMake 2.8.11	2016-04-06 11:33:53 +08:00
OpenCVCRTLinkage.cmake	fix MSVS2010 builds	2015-12-18 17:23:17 +03:00
OpenCVDetectAndroidSDK.cmake	Fix compilation problems with XCode 7.1.1 and cmake 3.3.2	2015-11-17 18:52:55 +03:00
OpenCVDetectApacheAnt.cmake
OpenCVDetectCStripes.cmake
OpenCVDetectCUDA.cmake	fixed to use NVCUVID in 'cudacodec' module.	2016-01-31 01:56:45 +09:00
OpenCVDetectCXXCompiler.cmake	The latest version (5.1.1) of the gnu compiler returns just its major version ("5") when given the "-dumpversion" argument. Gnu compiler developers don't consider this to be an error. A workaround for this case has been made.	2015-10-08 07:22:20 -04:00
OpenCVDetectDirectX.cmake
OpenCVDetectOpenCL.cmake	cmake: refactor OpenCL detection, allow custom configurations	2016-01-15 13:05:16 +03:00
OpenCVDetectPython.cmake	cmake: fix python detection	2016-01-20 19:01:00 +03:00
OpenCVDetectTBB.cmake	changed to find TBB library(VS2015)	2015-12-23 23:45:33 +09:00
OpenCVDetectVTK.cmake	Ported VTK cmake detection from master branch	2016-03-11 16:25:47 +03:00
OpenCVExtraTargets.cmake
OpenCVFindIntelPerCSDK.cmake
OpenCVFindIPP.cmake	distrib: remove useless static files from shared distribution package	2015-12-12 15:23:31 +03:00
OpenCVFindIPPAsync.cmake
OpenCVFindLATEX.cmake
OpenCVFindLibsGrfmt.cmake	brining over fix in master (#4140) for libz import on 64-bit android	2015-10-13 17:42:40 -06:00
OpenCVFindLibsGUI.cmake
OpenCVFindLibsPerf.cmake
OpenCVFindLibsVideo.cmake	cmake: fix find_library() for bzip2	2016-02-11 12:57:10 +03:00
OpenCVFindMatlab.cmake	Update OpenCVFindMatlab.cmake	2015-10-06 04:17:40 -05:00
OpenCVFindOpenEXR.cmake
OpenCVFindOpenNI2.cmake
OpenCVFindOpenNI.cmake
OpenCVFindVA_INTEL.cmake	fallback path & sample timing implemented	2015-09-04 02:42:49 +03:00
OpenCVFindVA.cmake	changed device detection procedure, added resizing surface to bigger size	2015-09-23 17:35:49 +03:00
OpenCVFindWebP.cmake
OpenCVFindXimea.cmake
OpenCVGenABI.cmake
OpenCVGenAndroidMK.cmake
OpenCVGenConfig.cmake	Make install paths relative to CMAKE_INSTALL_PREFIX	2016-03-19 16:41:51 +08:00
OpenCVGenHeaders.cmake
OpenCVGenInfoPlist.cmake	update osx and ios build_framework.py	2015-12-17 16:17:31 +03:00
OpenCVGenPkgconfig.cmake	fixes #5018: fix framework links in opencv.pc (MacOS)	2015-12-14 15:14:23 +03:00
OpenCVMinDepVersions.cmake
OpenCVModule.cmake	Merge branch '2.4' into master	2016-04-21 20:15:08 +03:00
OpenCVPackaging.cmake	Merge pull request #6279 from terfendail:vt/pythontest_data	2016-03-17 12:27:12 +00:00
OpenCVPCHSupport.cmake	[master] Fixed PCH warning during ARM crosscompilation	2015-12-22 15:24:02 +01:00
OpenCVUtils.cmake	cmake: don't use -isystem for opencv_contrib paths	2016-04-18 12:48:14 +03:00
OpenCVVersion.cmake