Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Alexander Alekhin
8221f57c26
Merge pull request #11729 from alalek:ffmpeg_update_3.4
2018-06-09 12:25:23 +00:00
Alexander Alekhin
390f0a5dcd
cmake: generate and install ffmpeg-download.ps1
...
64-bit only
2018-06-09 13:19:48 +03:00
Alexander Alekhin
d3696f3ad2
ffmpeg: update OpenCV FFmpeg wrapper (3.4)
2018-06-08 18:47:00 +03:00
Alexander Alekhin
f7aa2e0d44
ffmpeg: update wrapper
...
FFmpeg: 3.3.4 -> 3.4.2
LibVPX: 1.6.1 -> 1.7.0
OpenH264: 1.6.0 -> 1.7.0
2018-02-22 15:04:06 +03:00
Alexander Alekhin
cb5bc1832b
ffmpeg: update 3.3.4
2017-10-09 13:42:09 +03:00
Alexander Alekhin
359bd21bd7
ffmpeg: update 3.3.2
...
- ffmpeg 3.3 -> 3.3.2
- added VERSIONINFO
2017-07-04 18:49:30 +03:00
Alexander Alekhin
a8a1838615
update FFmpeg Windows wrapper
...
ffmpeg 3.2.1 -> 3.3
libvpx 1.6.0 -> 1.6.1
2017-04-18 22:12:34 +03:00
Alexander Alekhin
a7de4aca6a
cmake: update ocv_download
...
- more aggressive cache for files under CMAKE_BINARY_CACHE
* don't re-read files MD5
* don't repack archives
- add support for ENV{OPENCV_DOWNLOAD_PATH}
- added ID parameter as project/group identifier
- non-flat .cache directory (based on ID)
- download message prefix based on ID
- more detailed logging via ocv_download_log() macro
- force .gitignore file for .cache folder (with '*' pattern)
2017-03-30 19:36:33 +00:00
Maksim Shabunin
e72d353b45
Download cache
2017-03-24 16:19:56 +03:00
Alexander Alekhin
39ca6a0137
ffmpeg: update Windows binaries
...
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)
2016-12-02 15:47:15 +03:00
Alexander Alekhin
49194023b5
ffmpeg: remove compatibility glue code
2016-12-02 14:18:40 +03:00
Alexander Alekhin
39ff8a0d26
cmake: cleanup ffmpeg detection
2016-12-01 19:33:27 +03:00
Alexander Alekhin
186f6977bc
ffmpeg: update Windows binaries (ffmpeg 3.1.3)
2016-09-08 19:54:02 +03:00
Vadim Pisarevsky
6b09ada5d4
Merge pull request #6899 from alalek:ffmpeg_update
2016-07-21 07:31:11 +00:00
Alexander Alekhin
99b0845cd5
ffmpeg windows wrapper 2.7.1=>3.1.1, openh264 1.4.0=>1.5.0, vpx 1.5.0
2016-07-15 16:31:57 +03:00
Alexander Alekhin
ddc0b42bc3
migration: github.com/opencv/opencv
2016-07-12 12:51:12 +03:00
Alexander Alekhin
56ad207d37
update ffmpeg wrapper binaries
...
Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.
FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0
2015-07-03 19:13:15 +03:00