aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Jörg Krause <jkrause@posteo.de>2014-12-11 20:08:46 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-11 22:43:32 +0100
commit2d23d40279be39f70553974de11a5fc088622911 (patch)
treef28b590ebaacf4bdffa60fe85493ff7d37881e35 /package
parentfa3d2a11e939dc74431fa22edd9ab04e65a79244 (diff)
downloadbuildroot-2d23d40279be39f70553974de11a5fc088622911.tar.gz
buildroot-2d23d40279be39f70553974de11a5fc088622911.tar.bz2
package/ffmpeg: bump to version 2.5
Bump version and update hash file. Signed-off-by: Jörg Krause <jkrause@posteo.de> Tested-by: Jérôme Pouiller <jezz@sysmic.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-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 4363ce16ed..b45d375ce0 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 9ad041c0201fb8b2605c5c5c0259c373c793c32cfc96f7315fca67e900494afc ffmpeg-2.4.4.tar.bz2
+sha256 148cfd694b60245f9116f5932f3f60bb6dba47bcfef395cdda7a7d8ed48d57ac ffmpeg-2.5.tar.bz2
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 784d8b3567..1820dc4713 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FFMPEG_VERSION = 2.4.4
+FFMPEG_VERSION = 2.5
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES