Vadim Pisarevsky e055128d0d Merge pull request #4099 from sash-kan:fix.2822		2015-06-17 11:58:40 +00:00
..
include/opencv2	videoio: update ffmpeg backend	2015-06-09 16:30:57 +03: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 #4099 from sash-kan:fix.2822	2015-06-17 11:58:40 +00:00
test	Merge pull request #4083 from mshabunin:java-engine	2015-06-03 17:17:36 +00:00
CMakeLists.txt	Updated Manager for Android	2015-06-02 17:33:04 +03:00