Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2015-03-02 23:26:20 +01:00
393 changed files with 2344 additions and 7013 deletions

View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 9d383d7ef9dffe6980849a93accfef848e197fdac9b1fbd02fca2798f863411a ffmpeg-2.5.3.tar.bz2
sha256 cc91c166c2b0ad9aacc533e4d5637912df583b43834c68aeec12ded7e082a286 ffmpeg-2.5.4.tar.bz2

View File

@@ -4,7 +4,7 @@
#
################################################################################
FFMPEG_VERSION = 2.5.3
FFMPEG_VERSION = 2.5.4
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES