Skip to content

Commit 556768e

Browse files
committed
Merge pull request opencv#9805 from alalek:ffmpeg_update
2 parents 92a0808 + cb5bc18 commit 556768e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

3rdparty/ffmpeg/ffmpeg.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Binary branch name: ffmpeg/master_20170704
2-
# Binaries were created for OpenCV: f670a9927026629a4083e05a1612f0adcad7727e
3-
set(FFMPEG_BINARIES_COMMIT "a86e53eb35737a50e5100e26af3aa1d29e810890")
4-
set(FFMPEG_FILE_HASH_BIN32 "79c35cc654778e66237444bc562afbca")
5-
set(FFMPEG_FILE_HASH_BIN64 "0dc72775ec3c14d1e049f51dc1280dbb")
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")
66
set(FFMPEG_FILE_HASH_CMAKE "ec59008da403fb18ab3c1ed66aed583b")
77

88
function(download_win_ffmpeg script_var)

0 commit comments

Comments
 (0)