4 Commits

Author	SHA1	Message	Date
Andrey Kamaev	ad982f4ed6	Turn off video IO perf tests on Android	2012-10-26 17:00:31 +04:00
Andrey Kamaev	d6a8753124	Remove second argument from VideoCapture_Reading perf test	2012-10-10 19:40:19 +04:00
Andrey Kamaev	8ebd04cbf9	Fix sanity checks in highgui module	2012-10-09 19:39:03 +04:00
Vadim Pisarevsky	2fd1e2ea57	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00