Skip to content

O
opencv
Commit 8221f57c authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #11729 from alalek:ffmpeg_update_3.4

parents c198a353 d3696f3a
master 4.3.0 4.2.0 4.1.2 4.1.2-openvino 4.1.1 4.1.1-openvino 4.1.0 4.1.0-openvino 4.0.1 4.0.1-openvino 4.0.0 4.0.0-rc 4.0.0-openvino 4.0.0-beta 4.0.0-alpha 3.4.10 3.4.9 3.4.8 3.4.7 3.4.6 3.4.5 3.4.4 3.4.3 3.4.3-openvino 3.4.2 3.4.2-openvino
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
3rdparty/ffmpeg/ffmpeg.cmake
View file @ 8221f57c
# Binaries branch name: ffmpeg/master_20180220
# Binaries were created for OpenCV: 9819ebc0954c2df62943ebbd5936d325e5dc89e1
ocv_update(FFMPEG_BINARIES_COMMIT "0a0e88972a7ea97708378d0488a65f83e7cc5e69")
ocv_update(FFMPEG_FILE_HASH_BIN32 "b8120c07962d591e2e9071a1bf566fd0")
ocv_update(FFMPEG_FILE_HASH_BIN64 "dc9c50e7b05482acc25d6ce0ac61bf1d")
# Binaries branch name: ffmpeg/3.4_20180608
# Binaries were created for OpenCV: f5ddbbf65937d8f44e481e4ee1082961821f5c62
ocv_update(FFMPEG_BINARIES_COMMIT "8041bd6f5ad37045c258904ba3030bb3442e3911")
ocv_update(FFMPEG_FILE_HASH_BIN32 "fa5a2a4e2f37defcb95bde8ed145c2b3")
ocv_update(FFMPEG_FILE_HASH_BIN64 "2cc08fc4fef8199fe80e0f126684834f")
ocv_update(FFMPEG_FILE_HASH_CMAKE "3b90f67f4b429e77d3da36698cef700c")
function(download_win_ffmpeg script_var)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment