From b23d377567003e3c034158392368b1bda84a6443 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 8 Sep 2020 10:18:37 +0000 Subject: [PATCH] ffmpeg/4.x: update FFmpeg wrapper - FFmpeg 4.3.1 --- 3rdparty/ffmpeg/ffmpeg.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/3rdparty/ffmpeg/ffmpeg.cmake b/3rdparty/ffmpeg/ffmpeg.cmake index 458dd574f9..8cf0f24f5e 100644 --- a/3rdparty/ffmpeg/ffmpeg.cmake +++ b/3rdparty/ffmpeg/ffmpeg.cmake @@ -1,9 +1,9 @@ -# Binaries branch name: ffmpeg/master_20200609 -# Binaries were created for OpenCV: 5f3012fc9afbffbf53a38f1468523d3454b3e2f6 -ocv_update(FFMPEG_BINARIES_COMMIT "1df9bf0c0c6c2cf225bd3d8e4cf5985198352454") -ocv_update(FFMPEG_FILE_HASH_BIN32 "854b3460c435d04277e1f1ecc06cb809") -ocv_update(FFMPEG_FILE_HASH_BIN64 "3a46d6356220796e044817ae3a21cc31") -ocv_update(FFMPEG_FILE_HASH_CMAKE "ad57c038ba34b868277ccbe6dd0f9602") +# Binaries branch name: ffmpeg/master_20200908 +# Binaries were created for OpenCV: f445b826d084188077a5e9d204c4c33d1589f380 +ocv_update(FFMPEG_BINARIES_COMMIT "6152e132572dfdaa32887eabeb7199bef49b14dc") +ocv_update(FFMPEG_FILE_HASH_BIN32 "37e2dadf776631acc8856e281f29cf42") +ocv_update(FFMPEG_FILE_HASH_BIN64 "cf5dba83edf8619f57ccff4edb989c62") +ocv_update(FFMPEG_FILE_HASH_CMAKE "f8e65dbe4a3b4eedc0d2997e07c3f3fd") function(download_win_ffmpeg script_var) set(${script_var} "" PARENT_SCOPE)