diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-02-18 10:47:35 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-02-18 10:47:35 +0000 |
| commit | f876c2dbc00badc24678cbe0db046c037522e1af (patch) | |
| tree | 2287b75a1416686e135a9aefb4a9068902b3420f | |
| parent | Do not enable old xlib based x11grab when xcb is used. xcb based grabber is L... (diff) | |
| download | gentoo-2-f876c2dbc00badc24678cbe0db046c037522e1af.tar.gz gentoo-2-f876c2dbc00badc24678cbe0db046c037522e1af.tar.bz2 gentoo-2-f876c2dbc00badc24678cbe0db046c037522e1af.zip | |
zvbi requires gpl too
Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 7a6661a6c9d3..ecd1b4ac0f74 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.831 2015/02/18 10:44:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.832 2015/02/18 10:47:35 aballier Exp $ + + 18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + zvbi requires gpl too 18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: Do not enable old xlib based x11grab when xcb is used. xcb based grabber is diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 8511efb3e704..07097ba95313 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.180 2015/02/18 10:44:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.181 2015/02/18 10:47:35 aballier Exp $ EAPI="5" @@ -220,6 +220,7 @@ GPL_REQUIRED_USE=" frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) + zvbi? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) |