From 95a55250a7adbd88bddee27637bba425ffe4f637 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 5 Sep 2019 21:10:52 +0000 Subject: [PATCH] ffmpeg/4.x: update FFmpeg plugin ffmpeg: 4.1.3 -> 4.2.1 libvpx: 1.8.0 -> 1.8.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 b096a86041..5234479f79 100644 --- a/3rdparty/ffmpeg/ffmpeg.cmake +++ b/3rdparty/ffmpeg/ffmpeg.cmake @@ -1,9 +1,9 @@ -# Binaries branch name: ffmpeg/master_20190616 -# Binaries were created for OpenCV: 7b099e0fe2d929e55d6705b6ad510c2c9081606b -ocv_update(FFMPEG_BINARIES_COMMIT "998718df34e35ea0fa429724875fc3900faa266f") -ocv_update(FFMPEG_FILE_HASH_BIN32 "f03b47fb809edd2e06b6db135cbd3e49") -ocv_update(FFMPEG_FILE_HASH_BIN64 "5c4571459570c288d874704244c428b5") -ocv_update(FFMPEG_FILE_HASH_CMAKE "f710891525a04586d565d0e700e62a9c") +# Binaries branch name: ffmpeg/master_20190910 +# Binaries were created for OpenCV: bea2c7545243ba2dabce6badc94dd55894a8e5ca +ocv_update(FFMPEG_BINARIES_COMMIT "197f87f7e811a9ded35d989b37e50501ff6afaa4") +ocv_update(FFMPEG_FILE_HASH_BIN32 "ab380c9dde361f30dd3604f88eef6c48") +ocv_update(FFMPEG_FILE_HASH_BIN64 "90260a4da737fc045c9279567313ee9d") +ocv_update(FFMPEG_FILE_HASH_CMAKE "ad57c038ba34b868277ccbe6dd0f9602") function(download_win_ffmpeg script_var) set(${script_var} "" PARENT_SCOPE)