From 186f6977bcf64e1fc936a7022dd4d03bc9837d8f Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 8 Sep 2016 19:53:39 +0300 Subject: [PATCH] ffmpeg: update Windows binaries (ffmpeg 3.1.3) --- 3rdparty/ffmpeg/ffmpeg.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/ffmpeg/ffmpeg.cmake b/3rdparty/ffmpeg/ffmpeg.cmake index 193b5d8905..d89b0a573a 100644 --- a/3rdparty/ffmpeg/ffmpeg.cmake +++ b/3rdparty/ffmpeg/ffmpeg.cmake @@ -1,8 +1,8 @@ -# Binary branch name: ffmpeg/master_20160715 -# Binaries were created for OpenCV: 0e6aa189cb9a9642b0ae7983d301693516faad5d -set(FFMPEG_BINARIES_COMMIT "7eef9080d3271c7547d303fa839a62e1124ff1e6") -set(FFMPEG_FILE_HASH_BIN32 "3bb2a8388af90adf6c762210e696400d") -set(FFMPEG_FILE_HASH_BIN64 "ebcfc963f0a94f7e83d58d60eaf23849") +# Binary branch name: ffmpeg/master_20160908 +# Binaries were created for OpenCV: 11a65475d8d460a01c8818c5a2d0544ec49d7d68 +set(FFMPEG_BINARIES_COMMIT "03835134465888981e066434dc95009e8328d4ea") +set(FFMPEG_FILE_HASH_BIN32 "32ba7790b0ac7a6dc66be91603637a7d") +set(FFMPEG_FILE_HASH_BIN64 "068ecaa459a5571e7909cff90999a420") set(FFMPEG_FILE_HASH_CMAKE "f99941d10c1e87bf16b9055e8fc91ab2") set(FFMPEG_DOWNLOAD_URL ${OPENCV_FFMPEG_URL};$ENV{OPENCV_FFMPEG_URL};https://raw.githubusercontent.com/opencv/opencv_3rdparty/${FFMPEG_BINARIES_COMMIT}/ffmpeg/)