diff options
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/ffmpeg/Config.in | 1 | ||||
| -rw-r--r-- | package/multimedia/ffmpeg/ffmpeg.mk | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in index 7a9513c09..d11233e94 100644 --- a/package/multimedia/ffmpeg/Config.in +++ b/package/multimedia/ffmpeg/Config.in @@ -27,6 +27,7 @@ config BR2_PACKAGE_FFMPEG_NONFREE config BR2_PACKAGE_FFMPEG_FFMPEG bool "Build ffmpeg (the command line application)" + select BR2_PACKAGE_FFMPEG_SWSCALE default y help FFmpeg is a very fast video and audio converter. diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index 1e8f09a30..172bfc0f3 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ############################################################# -FFMPEG_VERSION = 0.6.1 +FFMPEG_VERSION = 0.6.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -13,6 +13,7 @@ FFMPEG_CONF_OPT = \ --prefix=/usr \ --enable-shared \ --disable-avfilter \ + $(if $(BR2_HAVE_DOCUMENTATION),,--disable-doc) ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) FFMPEG_CONF_OPT += --enable-gpl @@ -142,6 +143,14 @@ endif ifeq ($(BR2_cortex_a8),y) FFMPEG_CONF_OPT += --enable-neon endif +# Set powerpc altivec appropriately +ifeq ($(BR2_powerpc),y) +ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +FFMPEG_CONF_OPT -= --enable-altivec +else +FFMPEG_CONF_OPT += --disable-altivec +endif +endif FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) |