Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 13 Jun 2018 16:20:12 +0000 (19:20 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 13 Jun 2018 16:34:44 +0000 (19:34 +0300)
commit0d6518aaa05bc66b5724844938b6920627c5f13c
tree2cdd4dc461bdf57bd820281ed9f2808437910a92
parentd1a598c65201966a99b3b848b2a640a23d6902d0
parent54e8487f56154d4bde490c121cb6d3713ecb6da4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
12 files changed:
3rdparty/ffmpeg/ffmpeg.cmake
doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.markdown
doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.markdown
doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.markdown
doc/tutorials/imgproc/shapedescriptors/hull/hull.markdown
doc/tutorials/imgproc/shapedescriptors/moments/moments.markdown
doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.markdown
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.markdown
doc/tutorials/photo/hdr_imaging/hdr_imaging.markdown
modules/core/src/system.cpp
modules/core/test/test_mat.cpp
modules/videoio/src/videoio_registry.cpp