Alexander Alekhin 0105f8fa38 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-11-20 20:32:00 +00:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-11-20 20:32:00 +00:00
misc	Merge pull request #18855 from Rightpoint:feature/colejd/add-apple-conversions-to-framework-builds	2020-11-19 21:20:32 +00:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge pull request #18855 from Rightpoint:feature/colejd/add-apple-conversions-to-framework-builds	2020-11-19 21:20:32 +00:00
test	feat: change OpenJPEG encoder to lossy with default parameters	2020-08-27 15:11:45 +03:00
CMakeLists.txt	Merge pull request #18855 from Rightpoint:feature/colejd/add-apple-conversions-to-framework-builds	2020-11-19 21:20:32 +00:00