diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:22:06 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:29:56 +0100 |
| commit | 8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 (patch) | |
| tree | 8b22aaa4e3c283a73fe2af2eccdfa3926a5430ef /package/ffmpeg | |
| parent | 42dd856ca930f79a831361e337d25fb8dd6e0dd1 (diff) | |
| parent | 4f29cc436b24a8007b065253babe27b9346a479e (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ffmpeg')
| -rw-r--r-- | package/ffmpeg/ffmpeg.hash | 2 | ||||
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 541f421de..aa9f0f738 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da ffmpeg-3.2.tar.xz +sha256 1ecf93da5d601e6fb3096c65cbe33fdaf042d690a3c50c4efadb0a9b74f2badf ffmpeg-3.2.1.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index de6d8416c..699de2ac8 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.2 +FFMPEG_VERSION = 3.2.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES |