summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2011-06-23 14:39:34 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2011-06-23 14:39:34 +0000
commit0e6b6101ae1ce81326b67809a447ef28ea2532e0 (patch)
tree88a740a428b87c9c951d32b4b5d524da9f6e80b1 /media-video/ffmpeg
parentx86 stable wrt security bug #365273 (diff)
downloadgentoo-2-0e6b6101ae1ce81326b67809a447ef28ea2532e0.tar.gz
gentoo-2-0e6b6101ae1ce81326b67809a447ef28ea2532e0.tar.bz2
gentoo-2-0e6b6101ae1ce81326b67809a447ef28ea2532e0.zip
x86 stable wrt security bug #365273
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c01377831326..496fa95c3687 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.420 2011/06/23 12:59:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.421 2011/06/23 14:39:34 phajdan.jr Exp $
+
+ 23 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> ffmpeg-0.7_rc1.ebuild:
+ x86 stable wrt security bug #365273
*ffmpeg-0.8 (23 Jun 2011)
diff --git a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild b/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
index 4e7e8e1da7fc..0b0377269c2e 100644
--- a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.6 2011/06/21 13:59:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.7 2011/06/23 14:39:34 phajdan.jr Exp $
EAPI="2"
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~sparc x86 ~x86-fbsd"
fi
IUSE="
+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection