Skip to content

Commit

Permalink
ffmpeg: update Windows binaries
Browse files Browse the repository at this point in the history
Versions:
- ffmpeg 3.2.1 (was 3.1.3)
- openh264 1.6.0 (was 1.5.0)
- libvpx 1.6.0 (was 1.5.0)
  • Loading branch information
alalek committed Dec 2, 2016
1 parent 4919402 commit 39ca6a0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions 3rdparty/ffmpeg/ffmpeg.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# 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")
# Binary branch name: ffmpeg/master_20161202
# Binaries were created for OpenCV: 594c136d1fcbb5816c57516e50f9cbeffbd90835
set(FFMPEG_BINARIES_COMMIT "2a19d0006415955c79431116e4634f04d5eb5a74")
set(FFMPEG_FILE_HASH_BIN32 "f081abd9d6ca7e425d340ce586f9c090")
set(FFMPEG_FILE_HASH_BIN64 "a423363a6eb76d362ca6c406c96c8db6")
set(FFMPEG_FILE_HASH_CMAKE "5346ae1854fc7aa569a722e85af480ec")

set(FFMPEG_DOWNLOAD_URL ${OPENCV_FFMPEG_URL};$ENV{OPENCV_FFMPEG_URL};https://raw.githubusercontent.com/opencv/opencv_3rdparty/${FFMPEG_BINARIES_COMMIT}/ffmpeg/)

Expand Down

0 comments on commit 39ca6a0

Please sign in to comment.