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
..
doc/pics	squashed #823	2015-04-24 21:58:14 +02:00
include/opencv2	highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings	2016-03-24 23:58:47 +01:00
src	Merge branch '2.4' into master	2016-04-21 20:15:08 +03:00
test	delete video readers	2015-10-12 00:40:23 +03:00
CMakeLists.txt	WinRT consistency	2015-12-31 14:31:26 +01:00