summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-10-08 13:15:59 +0200
committerAlexis Ballier <aballier@gentoo.org>2017-10-08 13:16:16 +0200
commit1cb27768a8dc92100422dd4e83586ed219bb8cf5 (patch)
treeeddd6c5cdeadd8d8a1927f4ec1bd14ba7d638bc6 /media-video
parentsys-auth/thinkfinger: Strip empty metadata.xml elements (diff)
downloadgentoo-1cb27768a8dc92100422dd4e83586ed219bb8cf5.tar.gz
gentoo-1cb27768a8dc92100422dd4e83586ed219bb8cf5.tar.bz2
gentoo-1cb27768a8dc92100422dd4e83586ed219bb8cf5.zip
media-video/ffmpeg: add nasm as prefered asm compiler
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ac3d4666a006..227453fbbd4b 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -255,7 +255,7 @@ DEPEND="${RDEPEND}
doc? ( sys-apps/texinfo )
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
- cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+ cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
test? ( net-misc/wget sys-devel/bc )
v4l? ( sys-kernel/linux-headers )
"