Alexander Alekhin 0e6aa189cb Merge pull request #6905 from alalek:ffmpeg_fix_get_fps		2016-07-15 12:58:19 +00:00
..
include/opencv2	Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums	2016-06-28 16:40:30 +02:00
misc/java/test	Updated Manager for Android	2015-06-02 17:33:04 +03:00
perf
src	Merge pull request #6905 from alalek:ffmpeg_fix_get_fps	2016-07-15 12:58:19 +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