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
..
include/opencv2	Update imgcodecs.hpp	2015-11-19 00:25:36 +02:00
misc/java/test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
perf	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
src	Merge branch '2.4' into master	2016-04-21 20:15:08 +03:00
test	Camera orientation handling is added for jpeg files	2015-10-23 21:19:35 +03:00
CMakeLists.txt	update osx and ios build_framework.py	2015-12-17 16:17:31 +03:00