All of lore.kernel.org
 help / color / mirror / Atom feed
From: David du Colombier <0intro@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 2/2] ffmpeg: enable x264 support
Date: Sun,  5 Oct 2014 18:29:57 +0200	[thread overview]
Message-ID: <1412526597-31347-2-git-send-email-0intro@gmail.com> (raw)
In-Reply-To: <1412526597-31347-1-git-send-email-0intro@gmail.com>

Signed-off-by: David du Colombier <0intro@gmail.com>
---
Changes v1 -> v4:
  - s/FFMPEG_CONF_OPT/FFMPEG_CONF_OPTS/
---
 package/ffmpeg/ffmpeg.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 41b06a7..6b5711c 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
-- 
1.8.3.1

  reply	other threads:[~2014-10-05 16:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-05 16:29 [Buildroot] [PATCH v4 1/2] x264: new package David du Colombier
2014-10-05 16:29 ` David du Colombier [this message]
2014-10-07 21:08   ` [Buildroot] [PATCH v4 2/2] ffmpeg: enable x264 support Peter Korsgaard
2014-10-07 21:07 ` [Buildroot] [PATCH v4 1/2] x264: new package Peter Korsgaard
2014-10-08  8:13 ` Thomas Petazzoni
2014-10-08  9:47   ` David du Colombier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412526597-31347-2-git-send-email-0intro@gmail.com \
    --to=0intro@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.