summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid du Colombier <0intro@gmail.com>2014-10-05 18:29:57 +0200
committerPeter Korsgaard <peter@korsgaard.com>2014-10-07 22:59:08 +0200
commit3182056e98f698c3c7ed721cc76dc69aa9dcb008 (patch)
treee66b1bc967031e424e208ba7dbeac61214190e7d
parentf48a81fed0360d3728e15a22bea8909fac0a8b66 (diff)
downloadbuildroot-3182056e98f698c3c7ed721cc76dc69aa9dcb008.tar.gz
buildroot-3182056e98f698c3c7ed721cc76dc69aa9dcb008.zip
ffmpeg: enable x264 support
Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/ffmpeg/ffmpeg.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 1af47a61c9..af4e1f6668 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -229,6 +229,13 @@ else
FFMPEG_CONF_OPTS += --disable-libvpx
endif
+ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
+FFMPEG_CONF_OPTS += --enable-libx264
+FFMPEG_DEPENDENCIES += x264
+else
+FFMPEG_CONF_OPTS += --disable-libx264
+endif
+
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
FFMPEG_CONF_OPTS += --enable-yasm
FFMPEG_DEPENDENCIES += host-yasm
OpenPOWER on IntegriCloud