summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-12-09 08:31:54 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-12-09 08:31:54 +0000
commit5c110ed78428e4e638f4fa330a13e9fcaa0165c2 (patch)
treec4b71094579069f2054e2c46e7927db46a4b71c7 /media-video/ffmpeg
parentstable x86, security bug 347625 (diff)
downloadgentoo-2-5c110ed78428e4e638f4fa330a13e9fcaa0165c2.tar.gz
gentoo-2-5c110ed78428e4e638f4fa330a13e9fcaa0165c2.tar.bz2
gentoo-2-5c110ed78428e4e638f4fa330a13e9fcaa0165c2.zip
stable x86, security bug 347625
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e0efddf8c2b5..f5124a293515 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.388 2010/11/26 16:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.389 2010/12/09 08:31:54 fauli Exp $
+
+ 09 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
+ ffmpeg-0.6_p25767.ebuild:
+ stable x86, security bug 347625
26 Nov 2010; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.6_p25423.ebuild,
ffmpeg-0.6_p25767.ebuild:
diff --git a/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild b/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
index 6b6cabaa8aec..ebbf5722c57e 100644
--- a/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild,v 1.2 2010/11/26 16:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild,v 1.3 2010/12/09 08:31:54 fauli Exp $
EAPI="2"
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="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 alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"