diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-12-01 23:22:51 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-12-01 23:24:07 +0100 |
| commit | cc257ee493bbf3261417908684dbff834d853ae6 (patch) | |
| tree | cca896590d214d7bc90aad71fb8a76465438242b /package/ffmpeg | |
| parent | 2723fa4a5066b8820b4ff03e2912ccea9ea7c5e0 (diff) | |
| parent | 01e3d2eff15eb2535c4c15eb4f62467a50fe6a5f (diff) | |
| download | buildroot-cc257ee493bbf3261417908684dbff834d853ae6.tar.gz buildroot-cc257ee493bbf3261417908684dbff834d853ae6.zip | |
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 d0175cc6d7..d50c2cf359 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5790162028a868234f4f60b030f5f51bd70785de8a27878e271df029cdf4cb9a ffmpeg-2.8.1.tar.xz +sha256 18e22e3866d3b5fefcb1911c0d87ae8ababc30b7ea15901c1cf02885ccf6704a ffmpeg-2.8.3.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index d25346cd9e..dbf3a5ba16 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.8.1 +FFMPEG_VERSION = 2.8.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES |
