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-9999-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 83619bf69a5d..7e456e425a43 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.351 2010/05/11 10:18:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.352 2010/06/06 10:39:40 aballier Exp $
+
+ 06 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+ bump x264 requirements
11 May 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild,
metadata.xml:
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 8f2ac91b644b..8c59d19e91d4 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.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-9999-r1.ebuild,v 1.33 2010/05/11 10:18:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.34 2010/06/06 10:39:40 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.20100118 )
+ x264? ( >=media-libs/x264-0.0.20100605 )
xvid? ( >=media-libs/xvid-1.1.0 ) )
faad? ( >=media-libs/faad2-2.6.1 )
zlib? ( sys-libs/zlib )