Skip to content

Commit e851a41

Browse files
committed
Merge pull request opencv#10909 from alalek:ffmpeg_update
2 parents 5e0f95b + f7aa2e0 commit e851a41

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

3rdparty/ffmpeg/ffmpeg.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Binary branch name: ffmpeg/master_20171009
2-
# Binaries were created for OpenCV: 8ac2c5d620b467d3f22802e96c88ddde6da707af
3-
set(FFMPEG_BINARIES_COMMIT "66b1fed06cf3510235f367f96aa26da5cb234a15")
4-
set(FFMPEG_FILE_HASH_BIN32 "3ae76b105113d944984b2351c61e21c6")
5-
set(FFMPEG_FILE_HASH_BIN64 "cf3bb5bc9d393b022ea7a42eb63e794d")
6-
set(FFMPEG_FILE_HASH_CMAKE "ec59008da403fb18ab3c1ed66aed583b")
1+
# Binaries branch name: ffmpeg/master_20180220
2+
# Binaries were created for OpenCV: 9819ebc0954c2df62943ebbd5936d325e5dc89e1
3+
ocv_update(FFMPEG_BINARIES_COMMIT "0a0e88972a7ea97708378d0488a65f83e7cc5e69")
4+
ocv_update(FFMPEG_FILE_HASH_BIN32 "b8120c07962d591e2e9071a1bf566fd0")
5+
ocv_update(FFMPEG_FILE_HASH_BIN64 "dc9c50e7b05482acc25d6ce0ac61bf1d")
6+
ocv_update(FFMPEG_FILE_HASH_CMAKE "3b90f67f4b429e77d3da36698cef700c")
77

88
function(download_win_ffmpeg script_var)
99
set(${script_var} "" PARENT_SCOPE)

0 commit comments

Comments
 (0)