Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-09-01 15:22:07 +02:00
67 changed files with 370 additions and 308 deletions

View File

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