diff options
Diffstat (limited to 'media-video/tovid')
| -rw-r--r-- | media-video/tovid/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/tovid/tovid-0.31-r2.ebuild | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog index f6c86f6f63a7..5ef947b926b2 100644 --- a/media-video/tovid/ChangeLog +++ b/media-video/tovid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/tovid -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.24 2010/05/28 21:33:54 arfrever Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.25 2011/05/28 23:50:52 zmedico Exp $ + + 28 May 2011; Zac Medico <zmedico@gentoo.org> tovid-0.31-r2.ebuild: + Pull in virtual/ffmpeg instead of media-video/ffmpeg. 28 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> tovid-0.31-r2.ebuild: diff --git a/media-video/tovid/tovid-0.31-r2.ebuild b/media-video/tovid/tovid-0.31-r2.ebuild index ea2ccbe0f00f..8ad8a61a3f3b 100644 --- a/media-video/tovid/tovid-0.31-r2.ebuild +++ b/media-video/tovid/tovid-0.31-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.31-r2.ebuild,v 1.5 2010/05/28 21:33:54 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.31-r2.ebuild,v 1.6 2011/05/28 23:50:52 zmedico Exp $ inherit eutils python @@ -11,7 +11,7 @@ IUSE="tk wxwidgets" DEPEND="media-video/mplayer app-text/txt2tags" RDEPEND="media-video/mjpegtools - media-video/ffmpeg + virtual/ffmpeg >=media-video/transcode-1.1.5 media-sound/normalize media-gfx/imagemagick |