summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYixun Lan <dlan@gentoo.org>2015-02-16 08:27:10 +0000
committerYixun Lan <dlan@gentoo.org>2015-02-16 08:27:10 +0000
commit0fd5b1c6714171b5fd46c7d589886eb9308cf736 (patch)
tree73762bb0a0a59c0b06e8c497ce08e7ff0c6e5e53 /media-video/vlc/vlc-2.1.9999.ebuild
parentversion bump (diff)
downloadgentoo-2-0fd5b1c6714171b5fd46c7d589886eb9308cf736.tar.gz
gentoo-2-0fd5b1c6714171b5fd46c7d589886eb9308cf736.tar.bz2
gentoo-2-0fd5b1c6714171b5fd46c7d589886eb9308cf736.zip
revert commit, remove <media-videp/ffmpeg-2.5, since it already handled
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Diffstat (limited to 'media-video/vlc/vlc-2.1.9999.ebuild')
-rw-r--r--media-video/vlc/vlc-2.1.9999.ebuild4
1 files changed, 2 insertions, 2 deletions
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index 20c95556eccd..a33ca1716890 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.33 2015/02/16 02:16:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.34 2015/02/16 08:27:10 dlan Exp $
EAPI="5"
@@ -65,7 +65,7 @@ RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
avahi? ( >=net-dns/avahi-0.6:0[dbus] )
avcodec? (
- !libav? ( <media-video/ffmpeg-2.5:0= )
+ !libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:0= )
)
avformat? (