[gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/

[Andreas Sturmlechner]

commit:     0cc6977833961d39dd68ef2040878d26ec441615
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 02:41:26 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 02:47:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc69778

media-video/x264-encoder: Switch virtual/ffmpeg -> USE ffmpeg/libav

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/x264-encoder/x264-encoder-9999.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild 
b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 8c3b410528a..3a0cdc8541f 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -21,13 +21,16 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
        ~media-libs/x264-${PV}[interlaced=,threads=]
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? (
+               !libav? ( media-video/ffmpeg:= )
+               libav? ( media-video/libav:= )
+       )
        ffmpegsource? ( media-libs/ffmpegsource )
        mp4? ( >=media-video/gpac-0.5.2:= )"