Alexander Alekhin 49e1f6b161 Merge pull request #9091 from alalek:update_ffmpeg		2017-07-14 17:25:35 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	videoio: drop changes from legacy C-API header	2017-06-25 23:25:56 +03:00
misc	videoio: do not mix CV_CAP and CAP_ APIs enum values	2017-06-25 23:35:33 +03:00
perf	Rewritten some tests in videoio and imgcodecs modules	2017-06-20 18:20:41 +03:00
src	Merge pull request #9095 from alalek:fix_gstreamer	2017-07-14 17:24:14 +00:00
test	Merge pull request #9091 from alalek:update_ffmpeg	2017-07-14 17:25:35 +00:00
CMakeLists.txt	Fix WinRT build breaks in highgui and videoio.	2017-06-29 17:56:09 -07:00