platform/upstream/opencv.git
4 years agoConditional compilation for IR v7 support
Ilya Lavrenov [Wed, 24 Jun 2020 20:58:18 +0000 (23:58 +0300)]
Conditional compilation for IR v7 support

4 years agoMerge pull request #17605 from TolyaTalamanov:at/fix-plaidml-kernels-function
Alexander Alekhin [Wed, 24 Jun 2020 09:44:51 +0000 (09:44 +0000)]
Merge pull request #17605 from TolyaTalamanov:at/fix-plaidml-kernels-function

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 23 Jun 2020 19:15:47 +0000 (19:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17621 from YashasSamaga:cuda4dnn-mish-half
Alexander Alekhin [Tue, 23 Jun 2020 18:44:50 +0000 (18:44 +0000)]
Merge pull request #17621 from YashasSamaga:cuda4dnn-mish-half

4 years agoMerge pull request #17624 from dkurt:dnn_optimize_mish
Alexander Alekhin [Tue, 23 Jun 2020 18:43:50 +0000 (18:43 +0000)]
Merge pull request #17624 from dkurt:dnn_optimize_mish

4 years agoMerge pull request #17633 from alalek:backport_17616
Alexander Alekhin [Tue, 23 Jun 2020 18:29:55 +0000 (18:29 +0000)]
Merge pull request #17633 from alalek:backport_17616

4 years agoMerge pull request #17634 from dkurt:dnn_ie_cpu_ext_update_master
Alexander Alekhin [Tue, 23 Jun 2020 12:51:21 +0000 (12:51 +0000)]
Merge pull request #17634 from dkurt:dnn_ie_cpu_ext_update_master

4 years agoRemove deprecated Inference Engine CPU extensions
Dmitry Kurtaev [Mon, 22 Jun 2020 18:35:52 +0000 (21:35 +0300)]
Remove deprecated Inference Engine CPU extensions

4 years agoConditional compilation for network reader
Ilya Lavrenov [Mon, 22 Jun 2020 08:45:56 +0000 (11:45 +0300)]
Conditional compilation for network reader

origibal commit: 63e92cccf2c38c3c7a041d7968063a9a2445d40c

4 years agoMerge pull request #17622 from dkurt:dnn_ie_cpu_ext_update
Alexander Alekhin [Tue, 23 Jun 2020 11:01:47 +0000 (11:01 +0000)]
Merge pull request #17622 from dkurt:dnn_ie_cpu_ext_update

4 years agoRemove deprecated Inference Engine CPU extensions
Dmitry Kurtaev [Mon, 22 Jun 2020 18:35:52 +0000 (21:35 +0300)]
Remove deprecated Inference Engine CPU extensions

4 years agoOptimize Mish for CPU backend
Dmitry Kurtaev [Mon, 22 Jun 2020 20:22:21 +0000 (23:22 +0300)]
Optimize Mish for CPU backend

4 years agouse fp32 mish for fp16 mish
YashasSamaga [Mon, 22 Jun 2020 13:39:36 +0000 (19:09 +0530)]
use fp32 mish for fp16 mish

4 years agoMerge pull request #17616 from ilya-lavrenov:network-reader
Alexander Alekhin [Mon, 22 Jun 2020 12:10:34 +0000 (12:10 +0000)]
Merge pull request #17616 from ilya-lavrenov:network-reader

4 years agoMerge pull request #17576 from philippefoubert:branch_ximea
Alexander Alekhin [Mon, 22 Jun 2020 11:36:40 +0000 (11:36 +0000)]
Merge pull request #17576 from philippefoubert:branch_ximea

4 years agoMerge pull request #17617 from alalek:fix_logger_initialization
Alexander Alekhin [Mon, 22 Jun 2020 11:33:35 +0000 (11:33 +0000)]
Merge pull request #17617 from alalek:fix_logger_initialization

4 years agoMerge pull request #17592 from l-bat:disable_nms_in_yolo_layer
Alexander Alekhin [Mon, 22 Jun 2020 10:31:33 +0000 (10:31 +0000)]
Merge pull request #17592 from l-bat:disable_nms_in_yolo_layer

4 years agocore(logger): complete initialization of logger structures
Alexander Alekhin [Mon, 22 Jun 2020 09:27:26 +0000 (09:27 +0000)]
core(logger): complete initialization of logger structures

- for using of logging functions from global destructors

4 years agoConditional compilation for network reader
Ilya Lavrenov [Mon, 22 Jun 2020 08:45:56 +0000 (11:45 +0300)]
Conditional compilation for network reader

4 years agoAdd implementation in case plaidml isn't found
Anatoliy Talamanov [Sun, 21 Jun 2020 21:46:41 +0000 (00:46 +0300)]
Add implementation in case plaidml isn't found

4 years agoMerge pull request #17599 from tomoaki0705:fixCUDAFailSafePath
Alexander Alekhin [Sun, 21 Jun 2020 17:49:14 +0000 (17:49 +0000)]
Merge pull request #17599 from tomoaki0705:fixCUDAFailSafePath

4 years agomake the fail safe path actually safe
Tomoaki Teshima [Sat, 20 Jun 2020 22:20:47 +0000 (07:20 +0900)]
make the fail safe path actually safe
  * use only supported CC in the list
  * workaround of #17526

4 years agoMerge pull request #17593 from tomoaki0705:addAmpereCUDA
Alexander Alekhin [Sat, 20 Jun 2020 22:01:36 +0000 (22:01 +0000)]
Merge pull request #17593 from tomoaki0705:addAmpereCUDA

4 years agoMerge pull request #17526 from cyyever:fix_cuda_detection
Alexander Alekhin [Sat, 20 Jun 2020 21:07:05 +0000 (21:07 +0000)]
Merge pull request #17526 from cyyever:fix_cuda_detection

4 years agoFix the detection of the XIMEA library (since its location may be different when...
Philippe FOUBERT [Thu, 18 Jun 2020 09:09:08 +0000 (11:09 +0200)]
Fix the detection of the XIMEA library (since its location may be different when the version of the ximea software is updated)

4 years agoMerge pull request #17580 from sitic:bibfix
Alexander Alekhin [Fri, 19 Jun 2020 21:35:07 +0000 (21:35 +0000)]
Merge pull request #17580 from sitic:bibfix

4 years agoadd Ampere CC
Tomoaki Teshima [Fri, 19 Jun 2020 11:46:18 +0000 (20:46 +0900)]
add Ampere CC
  * Ampere has CC 8.0
  * Arm64 server support has been added in CUDA 11 (only V100 for now)

4 years agoDisabling dafault NMS in yolo layer
Liubov Batanina [Fri, 19 Jun 2020 11:34:13 +0000 (14:34 +0300)]
Disabling dafault NMS in yolo layer

4 years agodocs: linkfix in bibliography
Jan Lebert [Thu, 18 Jun 2020 11:30:36 +0000 (13:30 +0200)]
docs: linkfix in bibliography

The [current link](https://arxiv.org/pdf/1808.01752) goes to a
random unrelated paper.

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 19 Jun 2020 07:33:50 +0000 (07:33 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17587 from tomoaki0705:fixCUDAOptflowJetson
Alexander Alekhin [Fri, 19 Jun 2020 07:21:19 +0000 (07:21 +0000)]
Merge pull request #17587 from tomoaki0705:fixCUDAOptflowJetson

4 years agofix build on Jetson TX1 and TX2
Tomoaki Teshima [Thu, 18 Jun 2020 22:56:37 +0000 (07:56 +0900)]
fix build on Jetson TX1 and TX2
  * enable_if_t is a c++14 feature

4 years agoMerge pull request #17581 from tomoaki0705:fixCudaAsync
Alexander Alekhin [Thu, 18 Jun 2020 20:54:28 +0000 (20:54 +0000)]
Merge pull request #17581 from tomoaki0705:fixCudaAsync

4 years agoMerge pull request #17578 from Bleach665:fix_win_eigen_build
Alexander Alekhin [Thu, 18 Jun 2020 20:52:33 +0000 (20:52 +0000)]
Merge pull request #17578 from Bleach665:fix_win_eigen_build

4 years agoMerge pull request #17577 from philippefoubert:branch_color_yuv_simd
Alexander Alekhin [Thu, 18 Jun 2020 20:51:52 +0000 (20:51 +0000)]
Merge pull request #17577 from philippefoubert:branch_color_yuv_simd

4 years agoFix the build of imgproc using MinGW (variables with the same name as symbols defined...
Philippe FOUBERT [Thu, 18 Jun 2020 09:48:43 +0000 (11:48 +0200)]
Fix the build of imgproc using MinGW (variables with the same name as symbols defined in MinGW headers)

4 years agofix build error on Jetson TX1 and TX2
Tomoaki Teshima [Thu, 18 Jun 2020 12:25:15 +0000 (21:25 +0900)]
fix build error on Jetson TX1 and TX2
 * enable_if_t and is_base_of is c++14 feature
 * override is c++11 feature

4 years agofix VS Windows build with eigen. https://github.com/opencv/opencv/issues/17548
Yuriy Obukh [Thu, 18 Jun 2020 11:31:11 +0000 (14:31 +0300)]
fix VS Windows build with eigen. https://github.com/opencv/opencv/issues/17548

4 years agoMerge pull request #17573 from alexcohn:fix/android_windows_build
Alex Cohn [Thu, 18 Jun 2020 07:40:43 +0000 (10:40 +0300)]
Merge pull request #17573 from alexcohn:fix/android_windows_build

* fixing #17572

https://github.com/opencv/opencv/issues/17572 Build for Android failed: "can't concat str to bytes"

on Windows 10 64bit with python 3.6.6

* similar to changes in platforms/winpack_dldt/build_package.py

4 years agoMerge pull request #17571 from tomoaki0705:fixAutomaticCC
Alexander Alekhin [Thu, 18 Jun 2020 07:39:14 +0000 (07:39 +0000)]
Merge pull request #17571 from tomoaki0705:fixAutomaticCC

4 years agoMerge pull request #17568 from alalek:cleanup_17527
Alexander Alekhin [Thu, 18 Jun 2020 07:38:16 +0000 (07:38 +0000)]
Merge pull request #17568 from alalek:cleanup_17527

4 years agofix build error of automatic CC detection
Tomoaki Teshima [Wed, 17 Jun 2020 13:02:51 +0000 (22:02 +0900)]
fix build error of automatic CC detection

4 years agocudacodec(build): fix detection in CMake, cleanup duplicate includes
Alexander Alekhin [Tue, 16 Jun 2020 02:14:04 +0000 (02:14 +0000)]
cudacodec(build): fix detection in CMake, cleanup duplicate includes

4 years agoMerge pull request #17534 from YashasSamaga:cuda4dnn-remove-unused-funcs
Yashas Samaga B L [Wed, 17 Jun 2020 09:07:52 +0000 (14:37 +0530)]
Merge pull request #17534 from YashasSamaga:cuda4dnn-remove-unused-funcs

cuda4dnn: reduce CUDA version requirements to at least CUDA 9.2

* remove half2 specializations

* do not remove atomicAdd for half in CUDA 10 and below

* remove fp16.hpp

4 years agoMerge pull request #17468 from liqi-c:sharedlib_build_problem
NesQl [Wed, 17 Jun 2020 09:05:04 +0000 (17:05 +0800)]
Merge pull request #17468 from liqi-c:sharedlib_build_problem

TEngine installation rules fix for static build

* Modify cmake config error for -DBUILD_SHARED_LIBS=OFF

* Modify for not install tengine include directory

* Update compile error.

* move install command to tengine/CMakeLists.txt

* rm include dir when make install,only build static lib will install libtengine.a

4 years agoMerge pull request #17564 from l-bat:fix_yolov4
Alexander Alekhin [Wed, 17 Jun 2020 08:45:55 +0000 (08:45 +0000)]
Merge pull request #17564 from l-bat:fix_yolov4

4 years agoMerge pull request #17555 from komakai:objc-fix-sift
Alexander Alekhin [Wed, 17 Jun 2020 07:58:35 +0000 (07:58 +0000)]
Merge pull request #17555 from komakai:objc-fix-sift

4 years agoChanged StridedSlice to VariadicSplit in Region layer
Liubov Batanina [Tue, 16 Jun 2020 17:09:25 +0000 (20:09 +0300)]
Changed StridedSlice to VariadicSplit in Region layer

4 years agoMerge pull request #17556 from nglee:dev_optFlowTVL1Async
Alexander Alekhin [Tue, 16 Jun 2020 20:06:56 +0000 (20:06 +0000)]
Merge pull request #17556 from nglee:dev_optFlowTVL1Async

4 years agoMerge pull request #17561 from thatoddmailbox:android-fix-disable-samples
Alexander Alekhin [Tue, 16 Jun 2020 19:53:51 +0000 (19:53 +0000)]
Merge pull request #17561 from thatoddmailbox:android-fix-disable-samples

4 years agoMerge pull request #16772 from aDanPin:dp/performance_render_tests
Pinaev Danil [Tue, 16 Jun 2020 19:48:09 +0000 (22:48 +0300)]
Merge pull request #16772 from aDanPin:dp/performance_render_tests

Added g-api render performance tests

* Add render performance tests for BGROCV

* Add render NV12 performance tests

* Review response

* Review response

* Review response

* Review response

* Review response

* Review response

* Just a small fix

* Final review response I hope)

* Review response

* Review response

* Review response

* Review response

* Review response

* Review response

4 years agocuda optflow tvl1 : async safety
Namgoo Lee [Tue, 16 Jun 2020 16:04:22 +0000 (01:04 +0900)]
cuda optflow tvl1 : async safety

also modify cuda canny to use createTextureObjectPitch2D, etc.

4 years agoplatforms/android: fix --no_samples_build flag not working
Alex Studer [Tue, 16 Jun 2020 04:11:26 +0000 (00:11 -0400)]
platforms/android: fix --no_samples_build flag not working

4 years agoCleanup unneeded raw pointer handling code
Giles Payne [Mon, 15 Jun 2020 23:15:27 +0000 (08:15 +0900)]
Cleanup unneeded raw pointer handling code

4 years agoMerge pull request #17557 from alalek:backport_17554
Alexander Alekhin [Mon, 15 Jun 2020 19:26:11 +0000 (19:26 +0000)]
Merge pull request #17557 from alalek:backport_17554

4 years agoMerge pull request #17533 from alalek:fix_dumpInputArray_nd_case
Alexander Alekhin [Mon, 15 Jun 2020 18:38:19 +0000 (18:38 +0000)]
Merge pull request #17533 from alalek:fix_dumpInputArray_nd_case

4 years agoRemoved plugin dispatcher
Ilya Lavrenov [Mon, 15 Jun 2020 13:02:52 +0000 (16:02 +0300)]
Removed plugin dispatcher

backport of commit 74113737f3710069e5ae2daff09e77c824dd5a2b

4 years agoMerge pull request #17554 from ilya-lavrenov:plugin-dispatcher
Alexander Alekhin [Mon, 15 Jun 2020 18:02:03 +0000 (18:02 +0000)]
Merge pull request #17554 from ilya-lavrenov:plugin-dispatcher

4 years agoCUDA_OptFlow/OpticalFlowDual_TVL1 Asynchronous test
Namgoo Lee [Mon, 15 Jun 2020 16:43:51 +0000 (01:43 +0900)]
CUDA_OptFlow/OpticalFlowDual_TVL1 Asynchronous test

4 years agoUse cv::Ptr instead of raw pointers
Giles Payne [Mon, 15 Jun 2020 14:17:19 +0000 (23:17 +0900)]
Use cv::Ptr instead of raw pointers

4 years agoFix testFitEllipse test
Giles Payne [Mon, 15 Jun 2020 14:16:22 +0000 (23:16 +0900)]
Fix testFitEllipse test

4 years agoFix framework_name option in build script
Giles Payne [Mon, 15 Jun 2020 14:15:05 +0000 (23:15 +0900)]
Fix framework_name option in build script

4 years agoRemoved plugin dispatcher
Ilya Lavrenov [Mon, 15 Jun 2020 13:02:52 +0000 (16:02 +0300)]
Removed plugin dispatcher

4 years agoMerge pull request #17540 from YashasSamaga:cuda4dnn-update-mish
Alexander Alekhin [Sun, 14 Jun 2020 11:08:53 +0000 (11:08 +0000)]
Merge pull request #17540 from YashasSamaga:cuda4dnn-update-mish

4 years agoMerge pull request #17527 from tomoaki0705:detectCuvidHeader
Alexander Alekhin [Sun, 14 Jun 2020 11:08:16 +0000 (11:08 +0000)]
Merge pull request #17527 from tomoaki0705:detectCuvidHeader

4 years agoMerge pull request #17537 from Murazaki:patch-1
Alexander Alekhin [Sat, 13 Jun 2020 18:36:34 +0000 (18:36 +0000)]
Merge pull request #17537 from Murazaki:patch-1

4 years agoimprove mish performance and accuracy
YashasSamaga [Sat, 13 Jun 2020 11:23:27 +0000 (16:53 +0530)]
improve mish performance and accuracy

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 12 Jun 2020 22:20:50 +0000 (22:20 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17536 from ilya-lavrenov:remove-error-listener
Alexander Alekhin [Fri, 12 Jun 2020 22:18:04 +0000 (22:18 +0000)]
Merge pull request #17536 from ilya-lavrenov:remove-error-listener

4 years agoFix typo
Mehdi Zakaria Benadel [Fri, 12 Jun 2020 18:59:43 +0000 (20:59 +0200)]
Fix typo

This typo just made me lose my mind on the conan package update. please merge.

4 years agoMerge pull request #17538 from alalek:dnn_openvino_2020.3.0
Alexander Alekhin [Fri, 12 Jun 2020 21:24:34 +0000 (21:24 +0000)]
Merge pull request #17538 from alalek:dnn_openvino_2020.3.0

4 years agoRemoved error lisneter usage
Ilya Lavrenov [Fri, 12 Jun 2020 17:27:21 +0000 (20:27 +0300)]
Removed error lisneter usage

4 years agodnn: use OpenVINO 2020.3 defines
Alexander Alekhin [Tue, 7 Apr 2020 13:17:21 +0000 (16:17 +0300)]
dnn: use OpenVINO 2020.3 defines

4 years agocore: fix handling of ND-arrays in dumpInputArray() helpers
Alexander Alekhin [Fri, 12 Jun 2020 10:07:58 +0000 (10:07 +0000)]
core: fix handling of ND-arrays in dumpInputArray() helpers

4 years agoMerge pull request #17143 from cyyever:detect_mkl_installed_by_nuget
Alexander Alekhin [Fri, 12 Jun 2020 09:44:42 +0000 (09:44 +0000)]
Merge pull request #17143 from cyyever:detect_mkl_installed_by_nuget

4 years agoimprove the mkl search procedure
cyy [Sat, 29 Feb 2020 10:59:43 +0000 (18:59 +0800)]
improve the mkl search procedure

4 years agoMerge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1
Alexander Alekhin [Fri, 12 Jun 2020 06:58:14 +0000 (06:58 +0000)]
Merge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1

4 years agoMerge pull request #17528 from YashasSamaga:cuda4dnn-fix-tests43
Alexander Alekhin [Fri, 12 Jun 2020 06:55:34 +0000 (06:55 +0000)]
Merge pull request #17528 from YashasSamaga:cuda4dnn-fix-tests43

4 years agoAdded information to OpenCV documentation [MacOS]
Jessica Wong [Thu, 21 May 2020 12:36:19 +0000 (08:36 -0400)]
Added information to OpenCV documentation [MacOS]

Added and Edited specific information to the "Installation in MacOS" OpenCV documentation.
Closes #17340

4 years agofix corner case of libnvcuvid
Tomoaki Teshima [Thu, 11 Jun 2020 14:06:18 +0000 (23:06 +0900)]
fix corner case of libnvcuvid
  * detect header automatically and not based on version number

4 years agoallow multiple inputs to resize, fix tests
YashasSamaga [Thu, 11 Jun 2020 14:01:48 +0000 (19:31 +0530)]
allow multiple inputs to resize, fix tests

4 years agorespect CUDA_HOST_COMPILER when detecting CUDA arch
cyy [Thu, 11 Jun 2020 07:34:31 +0000 (15:34 +0800)]
respect CUDA_HOST_COMPILER when detecting CUDA arch

4 years agoMerge pull request #17511 from mshabunin:fix-kw-issues-34
Alexander Alekhin [Wed, 10 Jun 2020 12:13:06 +0000 (12:13 +0000)]
Merge pull request #17511 from mshabunin:fix-kw-issues-34

4 years agoQRDetectMulti: refactored checkPoints method
Maksim Shabunin [Mon, 8 Jun 2020 13:39:23 +0000 (16:39 +0300)]
QRDetectMulti: refactored checkPoints method

4 years agodnn/NGraph: added nullptr checks
Maksim Shabunin [Mon, 8 Jun 2020 18:57:27 +0000 (21:57 +0300)]
dnn/NGraph: added nullptr checks

4 years agoMerge pull request #17368 from themightyoarfish:cv2eigen-doc
Rasmus [Wed, 10 Jun 2020 07:53:18 +0000 (09:53 +0200)]
Merge pull request #17368 from themightyoarfish:cv2eigen-doc

* Add documentation about usage of cv2eigen functions in eigen.hpp

* Fixed Doxygen syntax.

Co-authored-by: Alexander Smorkalov <smorkalov.a.m@gmail.com>
4 years agoMerge pull request #17492 from cyyever:fix_data_race
Alexander Alekhin [Wed, 10 Jun 2020 07:01:04 +0000 (07:01 +0000)]
Merge pull request #17492 from cyyever:fix_data_race

4 years agoMerge pull request #16955 from themechanicalcoder:text_recognition
Gourav Roy [Wed, 10 Jun 2020 06:53:18 +0000 (12:23 +0530)]
Merge pull request #16955 from themechanicalcoder:text_recognition

* add text recognition sample

* fix pylint warning

* made changes according to the c++ example

* fix errors

* add text recognition sample

* update text detection sample

4 years agoMerge pull request #17509 from mshabunin:fix-kw-issues
Alexander Alekhin [Tue, 9 Jun 2020 11:11:39 +0000 (11:11 +0000)]
Merge pull request #17509 from mshabunin:fix-kw-issues

4 years agoMerge pull request #17507 from alalek:update_ffmpeg_4.4
Alexander Alekhin [Tue, 9 Jun 2020 09:31:16 +0000 (09:31 +0000)]
Merge pull request #17507 from alalek:update_ffmpeg_4.4

4 years agoQRDetectMulti: refactored checkPoints method
Maksim Shabunin [Mon, 8 Jun 2020 13:39:23 +0000 (16:39 +0300)]
QRDetectMulti: refactored checkPoints method

4 years agodnn/NGraph: added nullptr checks
Maksim Shabunin [Mon, 8 Jun 2020 18:57:27 +0000 (21:57 +0300)]
dnn/NGraph: added nullptr checks

4 years agoMerge pull request #17504 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Tue, 9 Jun 2020 07:51:59 +0000 (07:51 +0000)]
Merge pull request #17504 from alalek:update_ffmpeg_3.4

4 years agouse C++11 static variables as memory barrier
cyy [Tue, 9 Jun 2020 07:49:31 +0000 (15:49 +0800)]
use C++11 static variables as memory barrier

4 years agoffmpeg/4.4: update FFmpeg wrapper
Alexander Alekhin [Tue, 9 Jun 2020 02:54:52 +0000 (02:54 +0000)]
ffmpeg/4.4: update FFmpeg wrapper

- FFmpeg 4.2.3

4 years agoMerge pull request #17506 from alalek:update_version_4.4.0-pre
Alexander Alekhin [Tue, 9 Jun 2020 07:39:10 +0000 (07:39 +0000)]
Merge pull request #17506 from alalek:update_version_4.4.0-pre

4 years agopre: OpenCV 4.4.0 (version++)
Alexander Alekhin [Tue, 9 Jun 2020 02:27:13 +0000 (02:27 +0000)]
pre: OpenCV 4.4.0 (version++)

4 years agoffmpeg/3.4: update FFmpeg wrapper
Alexander Alekhin [Mon, 8 Jun 2020 21:03:05 +0000 (21:03 +0000)]
ffmpeg/3.4: update FFmpeg wrapper

- FFmpeg 3.4.7

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 8 Jun 2020 19:50:55 +0000 (19:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17501 from alalek:update_version_3.4.11-pre
Alexander Alekhin [Mon, 8 Jun 2020 19:35:34 +0000 (19:35 +0000)]
Merge pull request #17501 from alalek:update_version_3.4.11-pre