summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2015-04-12 11:07:46 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-04-12 19:05:23 +0200
commita215bade9af8b63f7391ca4b9cb852e1e5795952 (patch)
tree1fbef8b59410569fccc2d39d262b7aadf693b61c
parent9e7c4ef021bc76c53dd5e9203e5fabf63052f531 (diff)
downloadbuildroot-a215bade9af8b63f7391ca4b9cb852e1e5795952.tar.gz
buildroot-a215bade9af8b63f7391ca4b9cb852e1e5795952.zip
package/ffmpeg: bump version to 2.6.2
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/ffmpeg/ffmpeg.hash2
-rw-r--r--package/ffmpeg/ffmpeg.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
index 13487d190a..f2e4cd4df7 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 a4f6388706ee2daba9d35d2aa018ae5feeb450efa716555e011a6543d43ec7c1 ffmpeg-2.6.1.tar.bz2
+sha256 889e3aa069b724dc95cbfc79ef83322a8a39d9f6225f39fad1b47294fc1f29ba ffmpeg-2.6.2.tar.bz2
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 7d7fb19ce1..787dbb1884 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FFMPEG_VERSION = 2.6.1
+FFMPEG_VERSION = 2.6.2
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
OpenPOWER on IntegriCloud