Skip to content

Commit 374cc41

Browse files
committed
Merge pull request opencv#21296 from alalek:update_ffmpeg_4.x
2 parents 0e274fc + c4c43c3 commit 374cc41

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-
# Binaries branch name: ffmpeg/master_20211005
2-
# Binaries were created for OpenCV: 672399c751c431bbe52818b33fd3ca17b51e0e16
3-
ocv_update(FFMPEG_BINARIES_COMMIT "40b4666d1aa374205fd61373496e15d92ecd5313")
4-
ocv_update(FFMPEG_FILE_HASH_BIN32 "c2f9a897d464a2dce2286f8067ad9d90")
5-
ocv_update(FFMPEG_FILE_HASH_BIN64 "878a4e8fe5a4d68f18c9cdde543b9ead")
1+
# Binaries branch name: ffmpeg/4.x_20211220
2+
# Binaries were created for OpenCV: 0e274fc4bed8a64ba4f1c201a21304286e217afc
3+
ocv_update(FFMPEG_BINARIES_COMMIT "4d348507d156ec797a88a887cfa7f9129a35afac")
4+
ocv_update(FFMPEG_FILE_HASH_BIN32 "eece4ec8304188117ffc7d5dfd0fc0ae")
5+
ocv_update(FFMPEG_FILE_HASH_BIN64 "20deefbfe023c8b8d11a52e5a6527c6a")
66
ocv_update(FFMPEG_FILE_HASH_CMAKE "8862c87496e2e8c375965e1277dee1c7")
77

88
function(download_win_ffmpeg script_var)

0 commit comments

Comments
 (0)