summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2011-10-08 19:02:45 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2011-10-08 19:02:45 +0000
commit04f41994ea0ce04cdd5e4ccaff8fc6688a854b6e (patch)
tree2550659d09cda94ea81f31b131441d1459f5559f /media-video
parentalpha/arm/ia64/m68k/s390/sh/sparc stable wrt #384381 (diff)
downloadgentoo-2-04f41994ea0ce04cdd5e4ccaff8fc6688a854b6e.tar.gz
gentoo-2-04f41994ea0ce04cdd5e4ccaff8fc6688a854b6e.tar.bz2
gentoo-2-04f41994ea0ce04cdd5e4ccaff8fc6688a854b6e.zip
x86 stable wrt security bug #385511
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-0.7.6.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 971be78dd602..434bdd7b30cd 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.468 2011/10/07 06:04:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.469 2011/10/08 19:02:45 phajdan.jr Exp $
+
+ 08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> ffmpeg-0.7.6.ebuild:
+ x86 stable wrt security bug #385511
07 Oct 2011; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.7.6.ebuild:
Stable for HPPA (bug #385511).
diff --git a/media-video/ffmpeg/ffmpeg-0.7.6.ebuild b/media-video/ffmpeg/ffmpeg-0.7.6.ebuild
index 2536ccfdc586..ca9c539d27b4 100644
--- a/media-video/ffmpeg/ffmpeg-0.7.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7.6.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.6.ebuild,v 1.3 2011/10/07 06:04:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.6.ebuild,v 1.4 2011/10/08 19:02:45 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
fi
IUSE="
+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection