Peter Rekdal Sunde 278747ba45 Add support for ffmpeg 3.0.		2016-03-22 22:52:35 +01:00
..
include/opencv2	ximea new param	2016-02-17 11:18:49 +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	Add support for ffmpeg 3.0.	2016-03-22 22:52:35 +01: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