summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 c19c0bb13e75..009d7e3834c6 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.428 2011/06/29 15:07:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.429 2011/07/06 21:08:56 halcy0n Exp $
+
+ 06 Jul 2011; Mark Loeser <halcy0n@gentoo.org> ffmpeg-0.7_rc1.ebuild:
+ Mark stable for ppc64; bug 365273
29 Jun 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
drop the video_cards_nvidia guard for vdpau
diff --git a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild b/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
index 5a574a9bced5..26af5e14800e 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.9 2011/06/29 14:57:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.10 2011/07/06 21:08:56 halcy0n 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 ~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