summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-03-22 18:43:15 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2011-03-22 18:43:15 +0100
commite953b2b063191aac2f4afbc87176555eac300358 (patch)
treea353503b5f7085bba22365d96df131525aa7270d
parent[media-video/libav] Add live and release version of libav. (diff)
downloadscarabeus-e953b2b063191aac2f4afbc87176555eac300358.tar.gz
scarabeus-e953b2b063191aac2f4afbc87176555eac300358.tar.bz2
scarabeus-e953b2b063191aac2f4afbc87176555eac300358.zip
[media-video/libav] block ffmpeg.
-rw-r--r--media-video/libav/libav-0.6.2.ebuild2
-rw-r--r--media-video/libav/libav-9999.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/media-video/libav/libav-0.6.2.ebuild b/media-video/libav/libav-0.6.2.ebuild
index b12dc87..f2dc23a 100644
--- a/media-video/libav/libav-0.6.2.ebuild
+++ b/media-video/libav/libav-0.6.2.ebuild
@@ -32,6 +32,7 @@ for x in ${VIDEO_CARDS}; do
done
RDEPEND="
+ !media-video/ffmpeg
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
bzip2? ( app-arch/bzip2 )
@@ -58,7 +59,6 @@ RDEPEND="
vpx? ( media-libs/libvpx )
X? ( x11-libs/libX11 x11-libs/libXext )
zlib? ( sys-libs/zlib )
- !media-video/qt-faststart
"
DEPEND="${RDEPEND}
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index b12dc87..f2dc23a 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -32,6 +32,7 @@ for x in ${VIDEO_CARDS}; do
done
RDEPEND="
+ !media-video/ffmpeg
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
bzip2? ( app-arch/bzip2 )
@@ -58,7 +59,6 @@ RDEPEND="
vpx? ( media-libs/libvpx )
X? ( x11-libs/libX11 x11-libs/libXext )
zlib? ( sys-libs/zlib )
- !media-video/qt-faststart
"
DEPEND="${RDEPEND}