libtwolame is now supported (without libsndfile)

ffmpeg_4.4.2
Javernaut 5 years ago
parent ffabe91a8c
commit acf3c9573d
  1. 2
      .travis.yml
  2. 21
      scripts/libtwolame/build.sh
  3. 9
      scripts/libtwolame/download.sh
  4. 5
      scripts/parse-arguments.sh

@ -17,4 +17,4 @@ install:
- curl http://archive.ubuntu.com/ubuntu/pool/universe/n/nasm/nasm_2.14.02-1_amd64.deb --output $HOME/nasm_2.14.02-1_amd64.deb
- sudo dpkg -i $HOME/nasm_2.14.02-1_amd64.deb
script:
- ./ffmpeg-android-maker.sh -dav1d -mp3lame -aom -opus -wavpack -android=18
- ./ffmpeg-android-maker.sh -dav1d -mp3lame -aom -opus -wavpack -twolame -android=18

@ -0,0 +1,21 @@
#!/usr/bin/env bash
# TODO Consider adding a dependency - libsndfile
./configure \
--prefix=${INSTALL_DIR} \
--host=${TARGET} \
--with-sysroot=${SYSROOT_PATH} \
--disable-shared \
--enable-static \
--with-pic \
--disable-sndfile \
CC=${FAM_CC} \
AR=${FAM_AR} \
RANLIB=${FAM_RANLIB} || exit 1
export FFMPEG_EXTRA_LD_FLAGS="${FFMPEG_EXTRA_LD_FLAGS} -lm"
${MAKE_EXECUTABLE} clean
${MAKE_EXECUTABLE} -j${HOST_NPROC}
${MAKE_EXECUTABLE} install

@ -0,0 +1,9 @@
#!/usr/bin/env bash
source ${SCRIPTS_DIR}/common-functions.sh
TWOLAME_VERSION=0.4.0
downloadTarArchive \
"libtwolame" \
"https://netix.dl.sourceforge.net/project/twolame/twolame/${TWOLAME_VERSION}/twolame-${TWOLAME_VERSION}.tar.gz"

@ -79,9 +79,12 @@ for argument in "$@"; do
--enable-libopus|-opus)
EXTERNAL_LIBRARIES+=( "libopus" )
;;
--enable-wavpack|-wavpack)
--enable-libwavpack|-wavpack)
EXTERNAL_LIBRARIES+=( "libwavpack" )
;;
--enable-libtwolame|-twolame)
EXTERNAL_LIBRARIES+=( "libtwolame" )
;;
*)
echo "Unknown argument $argument"
;;

Loading…
Cancel
Save