diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-07-04 08:20:56 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-07-04 08:20:56 +0000 |
| commit | 25aa0cc39103b8a4760924fe6cc182865afc8b60 (patch) | |
| tree | 081c135b5b2af19d69aa8f0b61b0cf5dac789a33 /media-video/ffmpeg | |
| parent | Remove unneeded doxygen and rails dependencies. (diff) | |
| download | gentoo-2-25aa0cc39103b8a4760924fe6cc182865afc8b60.tar.gz gentoo-2-25aa0cc39103b8a4760924fe6cc182865afc8b60.tar.bz2 gentoo-2-25aa0cc39103b8a4760924fe6cc182865afc8b60.zip | |
Reflect upstream changes for the way of disabling libavdevice in/outdevs
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999-r1.ebuild | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index a30c6ec016f9..2e3a7703e4da 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.297 2009/07/03 19:36:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.298 2009/07/04 08:20:56 aballier Exp $ + + 04 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: + Reflect upstream changes for the way of disabling libavdevice in/outdevs 03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: force a non free license only when needed, ie, when faac or amr is diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 27946b0a1a69..9067815f63d5 100644 --- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.6 2009/07/03 19:36:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.7 2009/07/04 08:20:56 aballier Exp $ EAPI=2 @@ -84,13 +84,13 @@ src_configure() { # libavdevice options use ieee1394 && myconf="${myconf} --enable-libdc1394" - # Demuxers + # Indevs for i in v4l v4l2 alsa oss jack ; do - use $i || myconf="${myconf} --disable-demuxer=$i" + use $i || myconf="${myconf} --disable-indev=$i" done - # Muxers + # Outdevs for i in alsa oss ; do - use $i || myconf="${myconf} --disable-muxer=$i" + use $i || myconf="${myconf} --disable-outdev=$i" done use X && myconf="${myconf} --enable-x11grab" |