Browse Source

ffmpeg: Mark as conflicting with libav

android-5
Fredrik Fornwall 9 years ago
parent
commit
47b2c44e06
  1. 1
      disabled-packages/ffmpeg/build.sh

1
disabled-packages/ffmpeg/build.sh

@ -6,6 +6,7 @@ TERMUX_PKG_FOLDERNAME=FFmpeg-n$TERMUX_PKG_VERSION
# libbz2 is used by matroska decoder: # libbz2 is used by matroska decoder:
TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac" TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac"
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
TERMUX_PKG_CONFLICTS="libav"
termux_step_configure () { termux_step_configure () {
cd $TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_BUILDDIR

Loading…
Cancel
Save