Alexander Alekhin 80102b76f9 Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility		2016-02-11 15:00:52 +00:00
..
include/opencv2	ximea interface update	2016-02-09 10:36:22 +01:00
misc/java/test	Updated Manager for Android	2015-06-02 17:33:04 +03:00
perf	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
src	Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility	2016-02-11 15:00:52 +00:00
test	Merge 2.4 into master	2015-12-08 10:24:54 +03:00
CMakeLists.txt	- removed whitespaces	2016-01-25 13:13:13 +01:00