From: Alexander Alekhin Date: Tue, 8 Jun 2021 14:18:24 +0000 (+0000) Subject: ffmpeg/4.x: update FFmpeg wrapper 2021.06 X-Git-Tag: accepted/tizen/unified/20220125.121719~1^2~39^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=039bcd932a49f9fcc4b1bb41e613d7c68da83f3f;p=platform%2Fupstream%2Fopencv.git ffmpeg/4.x: update FFmpeg wrapper 2021.06 - FFmpeg 4.4 - libvpx 1.10.0 --- diff --git a/3rdparty/ffmpeg/ffmpeg.cmake b/3rdparty/ffmpeg/ffmpeg.cmake index 3cd5e1b..764e4b1 100644 --- a/3rdparty/ffmpeg/ffmpeg.cmake +++ b/3rdparty/ffmpeg/ffmpeg.cmake @@ -1,9 +1,9 @@ -# Binaries branch name: ffmpeg/master_20210303 -# Binaries were created for OpenCV: 7ac6abe02a33bef445a5b77214ad31964e2c5cc1 -ocv_update(FFMPEG_BINARIES_COMMIT "629590c3ba09fb0c8eaa9ab858ff13d3a84ca1aa") -ocv_update(FFMPEG_FILE_HASH_BIN32 "638065d5a0dab8a828879942375dcac4") -ocv_update(FFMPEG_FILE_HASH_BIN64 "7f10ae2e6a080ba3714f7a38ee03ae15") -ocv_update(FFMPEG_FILE_HASH_CMAKE "f8e65dbe4a3b4eedc0d2997e07c3f3fd") +# Binaries branch name: ffmpeg/master_20210608 +# Binaries were created for OpenCV: eaa9228a4fdfb9c2465aea65a50ce2d16b55dce0 +ocv_update(FFMPEG_BINARIES_COMMIT "213fcd5d4897319a83207406036c4a5957fba010") +ocv_update(FFMPEG_FILE_HASH_BIN32 "bab661341c30862fa88627130219c0a5") +ocv_update(FFMPEG_FILE_HASH_BIN64 "ac99f9767a83103c31709628af685924") +ocv_update(FFMPEG_FILE_HASH_CMAKE "8862c87496e2e8c375965e1277dee1c7") function(download_win_ffmpeg script_var) set(${script_var} "" PARENT_SCOPE)