6 Commits

Author	SHA1	Message	Date
Marina Kolpakova	162f9fd7ea	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
Vadim Pisarevsky	bc3c49518d	ok, now positioning seem to work well, at least with ffmpeg 0.10.2 on MacOSX 10.7	2012-04-26 07:07:37 +00:00
Andrey Kamaev	2bedf5bfd5	Refactored build conditionals in highgui tests	2012-04-18 21:32:56 +00:00
Alexander Shishkov	0ac70e6883	fixed #1421	2012-03-29 13:46:54 +00:00
Vadim Pisarevsky	846e37ded5	fixed many warnings from GCC 4.6.1	2012-03-17 09:22:31 +00:00
Andrey Kamaev	4168a698f6	Fixed highgui tests for Android	2011-12-20 07:45:49 +00:00