summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2011-07-10 10:51:39 +0000
committerMarkus Meier <maekke@gentoo.org>2011-07-10 10:51:39 +0000
commit6d334ee507305f74ea58305a546828f433543dfd (patch)
treea59fbbf08026fd6254b948f7a392ecc651a86e76 /media-video/ffmpeg
parentarm stable, bug #365273 (diff)
downloadgentoo-2-6d334ee507305f74ea58305a546828f433543dfd.tar.gz
gentoo-2-6d334ee507305f74ea58305a546828f433543dfd.tar.bz2
gentoo-2-6d334ee507305f74ea58305a546828f433543dfd.zip
arm stable, bug #365273
(Portage version: 2.1.10.4/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 74b05c71cc71..5c8aa29ee78f 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.430 2011/07/06 21:49:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.431 2011/07/10 10:51:39 maekke Exp $
+
+ 10 Jul 2011; Markus Meier <maekke@gentoo.org> ffmpeg-0.7_rc1.ebuild:
+ arm stable, bug #365273
06 Jul 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
Factorise a bit the cpu features handling code and keep the declarations in
diff --git a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild b/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
index 26af5e14800e..e9d39b9378de 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.10 2011/07/06 21:08:56 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.11 2011/07/10 10:51:39 maekke 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