summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-01-19 11:41:08 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-01-19 11:41:08 +0000
commit9012f99cc307c318a38d8223d4b4113a64063caf (patch)
tree6774a544fadefdef4f6e8f84b71786eec64dce44 /media-video
parentnew snapshot (diff)
downloadgentoo-2-9012f99cc307c318a38d8223d4b4113a64063caf.tar.gz
gentoo-2-9012f99cc307c318a38d8223d4b4113a64063caf.tar.bz2
gentoo-2-9012f99cc307c318a38d8223d4b4113a64063caf.zip
Adjust x264 deps
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 6a0599b647c9..0c3d44f7b40e 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# 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.336 2010/01/09 15:32:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.337 2010/01/19 11:41:08 aballier Exp $
+
+ 19 Jan 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+ Adjust x264 deps
09 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
ffmpeg-0.5_p20373.ebuild:
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index e2192cbb42ee..8648a8b1f45f 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-9999-r1.ebuild,v 1.25 2009/11/25 06:06:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.26 2010/01/19 11:41:08 aballier Exp $
EAPI=2
SCM=""
@@ -44,7 +44,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
mp3? ( media-sound/lame )
vorbis? ( media-libs/libvorbis media-libs/libogg )
theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
- x264? ( >=media-libs/x264-0.0.20091021 )
+ x264? ( >=media-libs/x264-0.0.20100118 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
faad? ( >=media-libs/faad2-2.6.1 )
zlib? ( sys-libs/zlib )