Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 10 Mar 2020 22:44:14 +0000 (22:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 10 Mar 2020 22:49:51 +0000 (22:49 +0000)
commitd00e58cdb0f48e00deca7171a1ccb2a9449854b4
treeed88183982a90873f28691a93b13a4a08dafc373
parent3befdb4ae8f59bedff5ace11ea873bb404599f5a
parent9f82b74788b1aad9d45b123b5481288b8a6492c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/include/opencv2/core/operations.hpp
modules/core/src/parallel.cpp
modules/dnn/CMakeLists.txt
modules/dnn/include/opencv2/dnn/version.hpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/ts/src/ts.cpp
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/test/test_ffmpeg.cpp