Alexander Alekhin 44f8670719 Merge pull request #5171 from avershov:opencl-vaapi-interop		2015-08-21 12:47:14 +00:00
..
doc	Update cuda.markdown	2015-06-02 14:34:15 +01:00
include/opencv2	Merge pull request #5171 from avershov:opencl-vaapi-interop	2015-08-21 12:47:14 +00:00
misc/java	Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770)	2015-05-19 13:30:18 +03:00
perf	Fix for bug #5007: moved definition of Size_MatDepth_t and Size_MatDepth from ts_perf.hpp to perf_channels.cpp. This way they are closer to where they are needed and live in a different namespace (possibly the reason why the fix works).	2015-08-17 16:09:00 +01:00
src	Merge pull request #5171 from avershov:opencl-vaapi-interop	2015-08-21 12:47:14 +00:00
test	Merge pull request #5161 from alalek:fix_string	2015-08-20 12:49:54 +00:00
CMakeLists.txt	fix tests build (win,shared,world)	2015-06-05 16:30:36 +03:00