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
..
android_lib	android: add targetSdkVersion="21"	2015-10-12 18:12:34 +03:00
android_test	Fix compilation problems with XCode 7.1.1 and cmake 3.3.2	2015-11-17 18:52:55 +03:00
common_test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
generator	Deactivated two noisy camera-retrieval log messages in android	2016-04-13 09:17:33 +02:00
pure_test	cmake: use copy_if_different	2015-09-08 22:42:05 +03:00
build.xml.in	Fix for encoding errors when building Java source	2013-03-27 17:43:00 +04:00
check-tests.py	Normalized file endings.	2013-08-21 18:59:25 +04:00
CMakeLists.txt	Merge branch '2.4' into master	2016-04-21 20:15:08 +03:00