From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 13 Dec 2015 20:06:51 +0000 (-0500)
Subject: ffmpeg: Mark as conflicting with libav
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/47b2c44e06ae830b9f644f894c481e7a36ca6148?ds=inline

ffmpeg: Mark as conflicting with libav
---

diff --git a/disabled-packages/ffmpeg/build.sh b/disabled-packages/ffmpeg/build.sh
index d1ff4d33..a9188d25 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