diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2016-08-15 17:03:36 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-08-26 16:21:37 +0200 |
| commit | 2893d2f22c757edc3cfc6bc8fff8d2dbd7f7fe1a (patch) | |
| tree | c0dd6f0b2292fcc0198c042fe86ad8e828f0a9cc /package/ffmpeg/ffmpeg.mk | |
| parent | ff9ca7096bff21702f8d44c4c3b0380391fa8b19 (diff) | |
| download | buildroot-2893d2f22c757edc3cfc6bc8fff8d2dbd7f7fe1a.tar.gz buildroot-2893d2f22c757edc3cfc6bc8fff8d2dbd7f7fe1a.zip | |
package/ffmpeg: bump to version 3.1.2
- Remove non-existing configure options:
- --disable-mips32r2
- --disable-libvo-aacenc
- --enable-libdcadec
(https://github.com/FFmpeg/FFmpeg/commit/e259dc86a80398d56d1aabcf6203f80616a4d04d)
- Amend renamed configure options:
- --disable-mipsdspr1 has been renamed to --disable-mipsdsp
Remove all Kodi-related patches according to upstream repo:
https://github.com/xbmc/FFmpeg/commits/release/3.1-xbmc
Kodi now uses an unpatched ffmpeg.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/ffmpeg/ffmpeg.mk')
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index c42336f800..a816ceac29 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.8.7 +FFMPEG_VERSION = 3.1.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -40,7 +40,7 @@ FFMPEG_CONF_OPTS = \ --enable-runtime-cpudetect \ --disable-hardcoded-tables \ --disable-memalign-hack \ - --disable-mipsdspr1 \ + --disable-mipsdsp \ --disable-mipsdspr2 \ --disable-msa \ --enable-hwaccels \ @@ -57,7 +57,6 @@ FFMPEG_CONF_OPTS = \ --disable-libnut \ --disable-libopenjpeg \ --disable-libschroedinger \ - --disable-libvo-aacenc \ --disable-libvo-amrwbenc \ --disable-symver \ --disable-doc @@ -217,13 +216,6 @@ FFMPEG_CONF_OPTS += --disable-openssl endif endif -ifeq ($(BR2_PACKAGE_LIBDCADEC),y) -FFMPEG_CONF_OPTS += --enable-libdcadec -FFMPEG_DEPENDENCIES += libdcadec -else -FFMPEG_CONF_OPTS += --disable-libdcadec -endif - ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy) FFMPEG_DEPENDENCIES += libebur128 endif @@ -445,14 +437,6 @@ else FFMPEG_CONF_OPTS += --enable-mipsfpu endif -ifeq ($(BR2_mips_32r2),y) -FFMPEG_CONF_OPTS += \ - --enable-mips32r2 -else -FFMPEG_CONF_OPTS += \ - --disable-mips32r2 -endif - ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) FFMPEG_CONF_OPTS += --enable-altivec else |
