Vadim Pisarevsky 6b09ada5d4 Merge pull request #6899 from alalek:ffmpeg_update

2016-07-21 07:31:11 +00:00

..

include/opencv2

migration: github.com/opencv/opencv

2016-07-12 12:51:12 +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 #6884 from alalek:migration

2016-07-18 07:49:38 +00:00

test

test: ffmpeg: change resolution for H264 test

2016-07-21 00:20:18 +03:00

CMakeLists.txt

- removed whitespaces

2016-01-25 13:13:13 +01:00