From 47b2c44e06ae830b9f644f894c481e7a36ca6148 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 13 Dec 2015 15:06:51 -0500 Subject: [PATCH] ffmpeg: Mark as conflicting with libav --- disabled-packages/ffmpeg/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/disabled-packages/ffmpeg/build.sh b/disabled-packages/ffmpeg/build.sh index d1ff4d339..a9188d25b 100644 --- a/disabled-packages/ffmpeg/build.sh +++ b/disabled-packages/ffmpeg/build.sh @@ -6,6 +6,7 @@ TERMUX_PKG_FOLDERNAME=FFmpeg-n$TERMUX_PKG_VERSION # libbz2 is used by matroska decoder: TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples" +TERMUX_PKG_CONFLICTS="libav" termux_step_configure () { cd $TERMUX_PKG_BUILDDIR